From 32cdf790d779d1bb4bfbbd60bd0d70bfbc0c2603 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 6 Mar 2009 20:04:56 +0000 Subject: [PATCH] - drop dependency on gtk+1, nobody objected about playdv ok ajacoutot@ landry@ --- multimedia/libdv/Makefile | 24 +++++++------------ multimedia/libdv/patches/patch-configure | 12 +++++----- .../libdv/patches/patch-encodedv_Makefile_in | 8 +++---- multimedia/libdv/patches/patch-libdv_dv_c | 12 +++++----- .../libdv/patches/patch-playdv_Makefile_in | 12 ---------- multimedia/libdv/patches/patch-playdv_oss_c | 23 ------------------ .../libdv/patches/patch-playdv_playdv_c | 16 ------------- multimedia/libdv/pkg/PLIST | 10 ++++---- 8 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 multimedia/libdv/patches/patch-playdv_Makefile_in delete mode 100644 multimedia/libdv/patches/patch-playdv_oss_c delete mode 100644 multimedia/libdv/patches/patch-playdv_playdv_c diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index d88497463ec..0798b02e8f6 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.10 2007/11/17 20:39:02 steven Exp $ +# $OpenBSD: Makefile,v 1.11 2009/03/06 20:04:56 jasper Exp $ COMMENT= Quasar DV codec DISTNAME= libdv-0.104 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= multimedia HOMEPAGE= http://libdv.sourceforge.net/ -# GPL +# LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -20,21 +20,15 @@ USE_LIBTOOL= Yes SHARED_LIBS= dv 4.2 -MODGNU_SHARED_LIBS= dv '' +WANTLIB= c m pthread -MODULES= devel/gettext -LIB_DEPENDS= SDL.>=2::devel/sdl \ - gdk.>=1.2,gtk.>=1.2::x11/gtk+ \ - glib.>=1.2,gmodule.>=1.2::devel/glib \ - popt::devel/popt +LIB_DEPENDS= popt::devel/popt -WANTLIB= X11 Xext Xi Xv Xau Xdmcp Xrandr Xrender \ - c m ossaudio pthread usbhid - -USE_X11= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-sdl --enable-gtk --with-x +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --disable-sdl \ + --disable-gtk \ + --with-x CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/libdv/patches/patch-configure b/multimedia/libdv/patches/patch-configure index 02845ffc2b4..2a14febda94 100644 --- a/multimedia/libdv/patches/patch-configure +++ b/multimedia/libdv/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.4 2005/12/28 13:43:07 jakemsr Exp $ ---- configure.orig Mon Nov 29 19:23:44 2004 -+++ configure Fri Feb 11 01:22:37 2005 -@@ -20320,13 +20331,13 @@ fi +$OpenBSD: patch-configure,v 1.5 2009/03/06 20:04:56 jasper Exp $ +--- configure.orig Tue Nov 30 04:23:44 2004 ++++ configure Mon Mar 2 21:59:06 2009 +@@ -20320,13 +20320,13 @@ fi @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2005/12/28 13:43:07 jakemsr Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -20385,17 +20396,17 @@ fi +@@ -20385,17 +20385,17 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 if test $ac_cv_lib_pthread_pthread_create = yes; then @@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.4 2005/12/28 13:43:07 jakemsr Exp $ -@@ -20972,7 +20983,7 @@ fi +@@ -20972,7 +20972,7 @@ fi for ac_header in fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \ diff --git a/multimedia/libdv/patches/patch-encodedv_Makefile_in b/multimedia/libdv/patches/patch-encodedv_Makefile_in index 9b8ad71fc95..edf708a57e5 100644 --- a/multimedia/libdv/patches/patch-encodedv_Makefile_in +++ b/multimedia/libdv/patches/patch-encodedv_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-encodedv_Makefile_in,v 1.3 2005/02/22 22:24:36 naddy Exp $ ---- encodedv/Makefile.in.orig Mon Nov 29 19:23:42 2004 -+++ encodedv/Makefile.in Sat Feb 12 00:02:49 2005 +$OpenBSD: patch-encodedv_Makefile_in,v 1.4 2009/03/06 20:04:56 jasper Exp $ +--- encodedv/Makefile.in.orig Tue Nov 30 04:23:42 2004 ++++ encodedv/Makefile.in Mon Mar 2 21:59:06 2009 @@ -148,7 +148,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -10,7 +10,7 @@ $OpenBSD: patch-encodedv_Makefile_in,v 1.3 2005/02/22 22:24:36 naddy Exp $ LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -@@ -241,7 +241,7 @@ scan_packet_headers_SOURCES = scan_packe +@@ -241,7 +241,7 @@ scan_packet_headers_SOURCES = scan_packet_headers.c steal_header_SOURCES = steal_header.c ppmqscale_SOURCES = ppmqscale.c dvconnect_SOURCES = dvconnect.c diff --git a/multimedia/libdv/patches/patch-libdv_dv_c b/multimedia/libdv/patches/patch-libdv_dv_c index 807e38e36b7..867e2ef2edc 100644 --- a/multimedia/libdv/patches/patch-libdv_dv_c +++ b/multimedia/libdv/patches/patch-libdv_dv_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-libdv_dv_c,v 1.3 2005/02/22 22:24:36 naddy Exp $ ---- libdv/dv.c.orig Tue Oct 19 20:49:24 2004 -+++ libdv/dv.c Fri Feb 11 01:22:37 2005 +$OpenBSD: patch-libdv_dv_c,v 1.4 2009/03/06 20:04:56 jasper Exp $ +--- libdv/dv.c.orig Wed Oct 20 05:49:24 2004 ++++ libdv/dv.c Mon Mar 2 21:59:07 2009 @@ -67,8 +67,12 @@ #define DV_MB420_YUV_MMX(a,b,c,d,e) dv_mb420_YUY2_mmx(a,b,c,d,e) #endif @@ -14,7 +14,7 @@ $OpenBSD: patch-libdv_dv_c,v 1.3 2005/02/22 22:24:36 naddy Exp $ int dv_use_mmx; -@@ -798,7 +802,7 @@ dv_get_timestamp (dv_decoder_t *dv, char +@@ -798,7 +802,7 @@ dv_get_timestamp (dv_decoder_t *dv, char *tstptr) int id; if ((id = dv -> ssyb_pack [0x13]) != 0xff) { @@ -23,7 +23,7 @@ $OpenBSD: patch-libdv_dv_c,v 1.3 2005/02/22 22:24:36 naddy Exp $ "%02d:%02d:%02d.%02d", ((dv -> ssyb_data [id] [3] >> 4) & 0x03) * 10 + (dv -> ssyb_data [id] [3] & 0x0f), -@@ -853,7 +857,7 @@ dv_get_recording_datetime (dv_decoder_t +@@ -853,7 +857,7 @@ dv_get_recording_datetime (dv_decoder_t *dv, char *dtp year = dv -> ssyb_data [id1] [3]; year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f); year += (year < 25) ? 2000 : 1900; @@ -32,7 +32,7 @@ $OpenBSD: patch-libdv_dv_c,v 1.3 2005/02/22 22:24:36 naddy Exp $ "%04d-%02d-%02d %02d:%02d:%02d", year, ((dv -> ssyb_data [id1] [2] >> 4) & 0x01) * 10 + -@@ -875,7 +879,7 @@ dv_get_recording_datetime (dv_decoder_t +@@ -875,7 +879,7 @@ dv_get_recording_datetime (dv_decoder_t *dv, char *dtp year = dv -> vaux_data [id1] [3]; year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f); year += (year < 25) ? 2000 : 1900; diff --git a/multimedia/libdv/patches/patch-playdv_Makefile_in b/multimedia/libdv/patches/patch-playdv_Makefile_in deleted file mode 100644 index e0045688079..00000000000 --- a/multimedia/libdv/patches/patch-playdv_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-playdv_Makefile_in,v 1.3 2005/02/22 22:24:36 naddy Exp $ ---- playdv/Makefile.in.orig Mon Nov 29 19:23:43 2004 -+++ playdv/Makefile.in Sat Feb 12 00:02:49 2005 -@@ -123,7 +123,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lossaudio $(PTHREAD_LIBS) - LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ diff --git a/multimedia/libdv/patches/patch-playdv_oss_c b/multimedia/libdv/patches/patch-playdv_oss_c deleted file mode 100644 index 833f5879f1c..00000000000 --- a/multimedia/libdv/patches/patch-playdv_oss_c +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-playdv_oss_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $ ---- playdv/oss.c.orig 2002-12-31 15:03:42.000000000 -0800 -+++ playdv/oss.c 2004-01-09 00:13:47.000000000 -0800 -@@ -34,11 +34,19 @@ - #include - #include - #include -+#if HAVE_SYS_SOUNDCARD_H - #include -+#else -+#include -+#endif - - #include "oss.h" - -+#if !defined(__OpenBSD__) - static const char *default_device = "/dev/dsp"; -+#else -+static const char *default_device = "/dev/audio"; -+#endif - - #ifndef O_LARGEFILE - #define O_LARGEFILE 0 diff --git a/multimedia/libdv/patches/patch-playdv_playdv_c b/multimedia/libdv/patches/patch-playdv_playdv_c deleted file mode 100644 index 30e02359f1d..00000000000 --- a/multimedia/libdv/patches/patch-playdv_playdv_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-playdv_playdv_c,v 1.1 2005/02/22 22:24:36 naddy Exp $ ---- playdv/playdv.c.orig Fri Feb 11 01:57:43 2005 -+++ playdv/playdv.c Fri Feb 11 02:01:55 2005 -@@ -508,9 +508,9 @@ restart: - seconds += dv_player->tv[2].tv_sec; - fprintf(stderr,"Processed %d frames in %05.2f seconds (%05.2f fps)\n", - frame_count, seconds, (double)frame_count/seconds); -- if(!dv_player->arg_disable_video) { -- dv_display_exit(dv_player->display); -- } /* if */ -+ // if(!dv_player->arg_disable_video) { -+ // dv_display_exit(dv_player->display); -+ // } /* if */ - if(!dv_player->arg_disable_audio) { - dv_oss_close(dv_player->oss); - } /* if */ diff --git a/multimedia/libdv/pkg/PLIST b/multimedia/libdv/pkg/PLIST index 27b99776a9b..9de99342cd6 100644 --- a/multimedia/libdv/pkg/PLIST +++ b/multimedia/libdv/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.3 2004/10/13 01:44:20 jolan Exp $ -bin/dubdv +@comment $OpenBSD: PLIST,v 1.4 2009/03/06 20:04:56 jasper Exp $ +%%SHARED%% +@bin bin/dubdv @comment bin/dvconnect -bin/encodedv -bin/playdv +@bin bin/encodedv include/libdv/ include/libdv/dv.h include/libdv/dv_types.h @@ -13,5 +13,3 @@ lib/pkgconfig/libdv.pc @man man/man1/dubdv.1 @comment @man man/man1/dvconnect.1 @man man/man1/encodedv.1 -@man man/man1/playdv.1 -%%SHARED%%