diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-08 22:06:28 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-08 22:06:28 +0000 |
commit | 34fd3047e9f48c27f1dbba418147c50297b6b63b (patch) | |
tree | b8510c9cf110fbacab4ffe8c5410c6d49e857b87 /multimedia/avidemux | |
parent | cd8eff94c9822c569e385f3b81b22155c69d97a8 (diff) | |
download | pkgsrc-34fd3047e9f48c27f1dbba418147c50297b6b63b.tar.gz |
Fix build on DragonFly, pthread and X11 linkage.
Diffstat (limited to 'multimedia/avidemux')
-rw-r--r-- | multimedia/avidemux/Makefile | 3 | ||||
-rw-r--r-- | multimedia/avidemux/distinfo | 7 | ||||
-rw-r--r-- | multimedia/avidemux/patches/patch-aa | 9 | ||||
-rw-r--r-- | multimedia/avidemux/patches/patch-ab | 10 | ||||
-rw-r--r-- | multimedia/avidemux/patches/patch-af | 22 |
5 files changed, 40 insertions, 11 deletions
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 908c377f348..473a3b63db7 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/12/05 23:16:48 tron Exp $ +# $NetBSD: Makefile,v 1.40 2006/12/08 22:06:28 joerg Exp $ # DISTNAME= avidemux_2.3.0 @@ -21,6 +21,7 @@ USE_TOOLS+= gmake perl pkg-config CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" LIBS+= ${LIBOSSAUDIO} +CONFIGURE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} CONFIGURE_ENV+= ac_cv_path_ART_CONFIG=no CONFIGURE_ARGS+= --without-newfaad CONFIGURE_ARGS+= --disable-faad # Dolby doesn't allow binary distribution diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo index ff3664a4964..632ebb3195c 100644 --- a/multimedia/avidemux/distinfo +++ b/multimedia/avidemux/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.11 2006/12/05 18:31:07 tron Exp $ +$NetBSD: distinfo,v 1.12 2006/12/08 22:06:28 joerg Exp $ SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e Size (avidemux_2.3.0.tar.gz) = 4750919 bytes -SHA1 (patch-aa) = a320cdadfeb563af3ced0f1adc15da9b2d22c262 -SHA1 (patch-ab) = 744c90178da28af2e214d57211b4d631a06d8b2e +SHA1 (patch-aa) = c032d5bfe7641b89ee5f0adb65e75f1b0b31035e +SHA1 (patch-ab) = f6e79bf9dfbae621c6fd07499ff74bfd14a57150 SHA1 (patch-ac) = 7872afd5a1eebd6bd57de65a1cfac1ac4e3149ee SHA1 (patch-ad) = 3a0b32c90471d4589f50afca9495eff2b2b74fcb SHA1 (patch-ae) = 275ffd524e25fd9f3d3f27b503eb092857a6045a +SHA1 (patch-af) = ffd7495651e50e7655630ec4fe1ded3a57c9961a diff --git a/multimedia/avidemux/patches/patch-aa b/multimedia/avidemux/patches/patch-aa index 2ff358fef49..5d6a69b9658 100644 --- a/multimedia/avidemux/patches/patch-aa +++ b/multimedia/avidemux/patches/patch-aa @@ -1,10 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2006/12/03 10:33:03 xtraeme Exp $ +$NetBSD: patch-aa,v 1.5 2006/12/08 22:06:28 joerg Exp $ --- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig 2006-12-03 11:13:13.000000000 +0100 +++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2006-12-03 11:13:48.000000000 +0100 -@@ -28,7 +28,8 @@ +@@ -26,9 +26,10 @@ + #include <fcntl.h> + #include <sys/ioctl.h> - #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) +-#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) ++#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__DragonFly__) #include <soundcard.h> - const char *dsp = DEVOSSAUDIO;; + const char *dsp = DEVOSSAUDIO; diff --git a/multimedia/avidemux/patches/patch-ab b/multimedia/avidemux/patches/patch-ab index 9955190d918..6b183e1a4cd 100644 --- a/multimedia/avidemux/patches/patch-ab +++ b/multimedia/avidemux/patches/patch-ab @@ -1,13 +1,15 @@ -$NetBSD: patch-ab,v 1.4 2006/12/03 10:33:03 xtraeme Exp $ +$NetBSD: patch-ab,v 1.5 2006/12/08 22:06:28 joerg Exp $ --- avidemux/ADM_script/ADM_JSFunctions.cpp.orig 2006-12-03 11:19:32.000000000 +0100 +++ avidemux/ADM_script/ADM_JSFunctions.cpp 2006-12-03 11:20:16.000000000 +0100 -@@ -325,6 +325,8 @@ +@@ -325,7 +325,9 @@ JSBool systemExecute(JSContext *cx, JSOb // clear file descriptor table of forked process and fork #if defined( __linux__) || defined(__maxosx__) pid_t pidRtn = fork(); -+#elif __NetBSD__ +-#elif __FreeBSD__ ++#elif defined(__NetBSD__) + pid_t pidRtn = vfork(); - #elif __FreeBSD__ ++#elif defined(__FreeBSD__) || defined(__DragonFly__) pid_t pidRtn = rfork(RFPROC|RFCFDG); #endif + if(pidRtn == 0) diff --git a/multimedia/avidemux/patches/patch-af b/multimedia/avidemux/patches/patch-af new file mode 100644 index 00000000000..f87372fc226 --- /dev/null +++ b/multimedia/avidemux/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1 2006/12/08 22:06:28 joerg Exp $ + +--- configure.orig 2006-11-25 21:02:18.000000000 +0000 ++++ configure +@@ -18971,7 +18971,7 @@ echo "${ECHO_T}$use_cygwin" >&6; } + if test "x$use_cygwin" = "xyes"; then + LDFLAGS="$LDFLAGS -lpthreadGC1 " + else +- LDFLAGS="$LDFLAGS -lpthread -lX11 -lXext -L/usr/X11R6/lib" ++ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lX11 -lXext ${X11_LDFLAGS}" + fi + + +@@ -25715,7 +25715,7 @@ cat >>conftest.$ac_ext <<_ACEOF + + #include <stdlib.h> + +- #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) ++ #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) + #error + #endif + |