diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libdv/Makefile | 29 | ||||
-rw-r--r-- | multimedia/libdv/distinfo | 2 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-Makefile.in | 20 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-configure | 11 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-encodedv:dvconnect.c | 19 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-libdv:mmx.h | 25 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-playdv:display.h | 13 | ||||
-rw-r--r-- | multimedia/libdv/files/patch-playdv:oss.c | 2 | ||||
-rw-r--r-- | multimedia/libdv/pkg-plist | 9 |
9 files changed, 33 insertions, 97 deletions
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 36228325740d..96450a2f3228 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libdv -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 0.9.5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,6 +17,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ popt.0:${PORTSDIR}/devel/popt USE_GNOMELIBS= yes +USE_GTK= yes USE_XLIB= yes XFREE86_VERSION= 4 GNU_CONFIGURE= yes @@ -27,7 +27,8 @@ MAN1= encodedv.1 playdv.1 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config -DOC_FILES= ChangeLog README.dvconnect README.encoder +DOC_FILES= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \ + README.dvconnect README.encoder TODO .ifndef(WITHOUT_SDL) LIB_DEPENDS+= SDL-1.1.4:${PORTSDIR}/devel/sdl12 @@ -36,6 +37,8 @@ CONFIGURE_ARGS+= --enable-sdl CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" .endif +CONFIGURE_ARGS+= --with-x + pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> ATTENTION <===' @@ -48,9 +51,23 @@ pre-everything:: .endif @${ECHO_MSG} '===>' -post-configure: - @find ${WRKSRC} -type f -name Makefile -exec \ - ${PERL} -pi.orig -ne 's!-l(gdk|glib|gtk) !!g' {} \; +post-patch: + @${PERL} -pi -e 's|(pkgconfigdir =).+?(/pkgconfig)|\1 ${LOCALBASE}/libdata\2|' \ + ${WRKSRC}/Makefile.in + @${PERL} -pi -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \ + s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${PERL} -pi -e 's|stdint.h|sys/types.h|' \ + ${WRKSRC}/libdv/dv_types.h \ + ${WRKSRC}/libdv/encode.c + @${PERL} -pi -e 's|void\s+swab.+||' ${WRKSRC}/libdv/encode.c + @${PERL} -pi -e 's|SDL/|SDL11/|' ${WRKSRC}/playdv/display.h + @${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/encodedv/dvavi.c \ + ${WRKSRC}/encodedv/dvconnect.c + @${PERL} -pi -e 's|(^.+?<sys/mman.h>)|#include <sys/types.h>\n\1|' \ + ${WRKSRC}/encodedv/dvconnect.c + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|' \ + ${WRKSRC}/encodedv/Makefile.in post-install: .ifndef(NOPORTDOCS) diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo index a99be384838e..bae66fd35867 100644 --- a/multimedia/libdv/distinfo +++ b/multimedia/libdv/distinfo @@ -1 +1 @@ -MD5 (libdv-0.9.tar.gz) = f8709211c3309ba0071d1a3c4bf7ba26 +MD5 (libdv-0.9.5.tar.gz) = bfe00ab2e99e867738221d8e31e739e0 diff --git a/multimedia/libdv/files/patch-Makefile.in b/multimedia/libdv/files/patch-Makefile.in deleted file mode 100644 index d06f6dab5b9e..000000000000 --- a/multimedia/libdv/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig Mon Nov 19 02:04:08 2001 -+++ Makefile.in Mon Nov 19 02:05:55 2001 -@@ -348,7 +348,7 @@ - install-exec-am: - install-exec: install-exec-recursive - --install-data-am: install-pkgconfigDATA -+install-data-am: - install-data: install-data-recursive - - install-am: all-am -@@ -356,7 +356,7 @@ - install: install-recursive - uninstall-am: uninstall-pkgconfigDATA - uninstall: uninstall-recursive --all-am: Makefile $(DATA) config.h -+all-am: Makefile config.h - all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/multimedia/libdv/files/patch-configure b/multimedia/libdv/files/patch-configure deleted file mode 100644 index 75a4798d02b5..000000000000 --- a/multimedia/libdv/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Sun Jun 24 22:49:16 2001 -+++ configure Mon Nov 19 15:33:53 2001 -@@ -6381,7 +6381,7 @@ - HOST_X86_FALSE= - fi - --REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' -+REQUIRES='gtk >= 1.2.4' - - succeeded=no - diff --git a/multimedia/libdv/files/patch-encodedv:dvconnect.c b/multimedia/libdv/files/patch-encodedv:dvconnect.c deleted file mode 100644 index 8bf2c32376e6..000000000000 --- a/multimedia/libdv/files/patch-encodedv:dvconnect.c +++ /dev/null @@ -1,19 +0,0 @@ ---- encodedv/dvconnect.c.orig Sun Jun 24 13:21:45 2001 -+++ encodedv/dvconnect.c Mon Nov 19 00:53:05 2001 -@@ -24,6 +24,7 @@ - */ - - #include <stdio.h> -+#include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/mman.h> - #include <string.h> -@@ -38,7 +39,7 @@ - #include <popt.h> - #endif - --#include <malloc.h> -+#include <stdlib.h> - - #define CIP_N_NTSC 2436 - #define CIP_D_NTSC 38400 diff --git a/multimedia/libdv/files/patch-libdv:mmx.h b/multimedia/libdv/files/patch-libdv:mmx.h deleted file mode 100644 index 7033e5772aa0..000000000000 --- a/multimedia/libdv/files/patch-libdv:mmx.h +++ /dev/null @@ -1,25 +0,0 @@ ---- libdv/mmx.h.orig Thu Apr 26 16:08:25 2001 -+++ libdv/mmx.h Sun Feb 10 11:03:54 2002 -@@ -72,6 +72,9 @@ - __asm__ __volatile__ ( - /* See if CPUID instruction is supported ... */ - /* ... Get copies of EFLAGS into eax and ecx */ -+ "pushl %%ebx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%edx\n\t" - "pushf\n\t" - "popl %%eax\n\t" - "movl %%eax, %%ecx\n\t" -@@ -207,9 +210,11 @@ - "movl $0, %0\n\n\t" - - "Return:\n\t" -+ "popl %%edx\n\t" -+ "popl %%ecx\n\t" -+ "popl %%ebx\n\t" - : "=a" (rval) - : /* no input */ -- : "ebx", "ecx", "edx" - ); - - /* Return */ diff --git a/multimedia/libdv/files/patch-playdv:display.h b/multimedia/libdv/files/patch-playdv:display.h deleted file mode 100644 index a734cd14f6c5..000000000000 --- a/multimedia/libdv/files/patch-playdv:display.h +++ /dev/null @@ -1,13 +0,0 @@ ---- playdv/display.h.orig Sun Jun 24 13:06:30 2001 -+++ playdv/display.h Wed Nov 21 03:52:21 2001 -@@ -38,8 +38,8 @@ - #endif // HAVE_LIBXV - - #if HAVE_SDL --#include <SDL/SDL.h> --#include <SDL/SDL_syswm.h> -+#include <SDL.h> -+#include <SDL_syswm.h> - #endif // HAVE_SDL - - #if HAVE_GTK diff --git a/multimedia/libdv/files/patch-playdv:oss.c b/multimedia/libdv/files/patch-playdv:oss.c index 583be30e8f7b..c95592086a08 100644 --- a/multimedia/libdv/files/patch-playdv:oss.c +++ b/multimedia/libdv/files/patch-playdv:oss.c @@ -17,6 +17,6 @@ +# endif +#endif + - static const gchar *default_device = "/dev/audio"; + static const char *default_device = "/dev/dsp"; dv_oss_t * diff --git a/multimedia/libdv/pkg-plist b/multimedia/libdv/pkg-plist index e513f049b4e5..bf562e869102 100644 --- a/multimedia/libdv/pkg-plist +++ b/multimedia/libdv/pkg-plist @@ -1,14 +1,21 @@ bin/encodedv bin/playdv include/libdv/dv.h +include/libdv/dv1394.h include/libdv/dv_types.h lib/libdv.a lib/libdv.la lib/libdv.so lib/libdv.so.1 +libdata/pkgconfig/libdv.pc +%%PORTDOCS%%share/doc/libdv/AUTHORS +%%PORTDOCS%%share/doc/libdv/COPYING +%%PORTDOCS%%share/doc/libdv/COPYRIGHT %%PORTDOCS%%share/doc/libdv/ChangeLog +%%PORTDOCS%%share/doc/libdv/NEWS +%%PORTDOCS%%share/doc/libdv/README %%PORTDOCS%%share/doc/libdv/README.dvconnect %%PORTDOCS%%share/doc/libdv/README.encoder +%%PORTDOCS%%share/doc/libdv/TODO %%PORTDOCS%%@dirrm share/doc/libdv @dirrm include/libdv - |