diff options
-rw-r--r-- | multimedia/transcode/Makefile | 28 | ||||
-rw-r--r-- | multimedia/transcode/distinfo | 15 | ||||
-rw-r--r-- | multimedia/transcode/patches/patch-aa | 8 | ||||
-rw-r--r-- | multimedia/transcode/patches/patch-ac | 43 | ||||
-rw-r--r-- | multimedia/transcode/patches/patch-ad | 13 | ||||
-rw-r--r-- | multimedia/transcode/patches/patch-av | 6 |
6 files changed, 65 insertions, 48 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 8706c37ed5f..04b1cd0c586 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,32 +1,28 @@ -# $NetBSD: Makefile,v 1.51 2008/11/10 17:21:37 wiz Exp $ -# +# $NetBSD: Makefile,v 1.52 2008/11/21 17:35:12 adam Exp $ -DISTNAME= transcode-1.0.6 -PKGREVISION= 3 +DISTNAME= transcode-1.0.7 CATEGORIES= multimedia -MASTER_SITES= http://fromani.exit1.org/ +MASTER_SITES= http://download.berlios.de/tcforge/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.transcoding.org/ +HOMEPAGE= http://tcforge.berlios.de/ COMMENT= Command line video-stream processing tool PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= awk:run gmake pkg-config -USE_LANGUAGES= c c++ - -CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q} +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_TOOLS+= awk:run gmake pkg-config +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-xio CONFIGURE_ARGS+= --enable-libpostproc -CONFIGURE_ARGS+= \ - --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg} CONFIGURE_ARGS+= --enable-oss -CONFIGURE_ARGS+= --disable-xio CONFIGURE_ARGS+= --enable-ogg CONFIGURE_ARGS+= --enable-theora CONFIGURE_ARGS+= --enable-vorbis +CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg} +CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q} PTHREAD_AUTO_VARS= yes PTHREAD_OPTS= require @@ -40,8 +36,8 @@ PLIST.i386= yes PLIST_VARS+= i386 - .include "options.mk" + .include "../../audio/faac/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo index 800783ce88e..ef7d871784f 100644 --- a/multimedia/transcode/distinfo +++ b/multimedia/transcode/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.15 2008/09/15 12:46:44 abs Exp $ +$NetBSD: distinfo,v 1.16 2008/11/21 17:35:12 adam Exp $ -SHA1 (transcode-1.0.6.tar.bz2) = 07905f6b0bd5eda881cbce2d8678c13beed47acb -RMD160 (transcode-1.0.6.tar.bz2) = 46d53cdd2b60032ccd8dc8bb53007e3903f6e1bb -Size (transcode-1.0.6.tar.bz2) = 1937157 bytes -SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2 +SHA1 (transcode-1.0.7.tar.bz2) = 480f1997ae391f29f6493993ec7b1cdbcf8afbc6 +RMD160 (transcode-1.0.7.tar.bz2) = f302972d8cf784e356753f7c21a012a73246ae71 +Size (transcode-1.0.7.tar.bz2) = 1942127 bytes +SHA1 (patch-aa) = d6f632f99ea8452686797aeb22928a155c1a0775 SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2 -SHA1 (patch-ac) = 392fe7c9b0c3361662de49ab13ea2f7c23f0fb0b -SHA1 (patch-ad) = 3183822ac86a15a69b76db17d763a212c1a0a46d +SHA1 (patch-ac) = ab93f1f98c1788db135e62653250a474c8d6f140 SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42 SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75 SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa @@ -14,5 +13,5 @@ SHA1 (patch-ar) = 8e13af23fb6d5c3a3140a43387955a922f88a48b SHA1 (patch-as) = f52658ae005ad3d68134a33878eb634e949a269a SHA1 (patch-at) = 60e6c507049e3fd1723440859b90e828aac968ad SHA1 (patch-au) = 3d06c68c60cda13d235a440b13a07d11b8de7877 -SHA1 (patch-av) = 40f3a47adedce2a9286d4b3e1204266f46e3e4f7 +SHA1 (patch-av) = a48a2f2389091007ed7658763ac93d694094a766 SHA1 (patch-aw) = 8af9050101faf78fe82145400677d0a398aa7fec diff --git a/multimedia/transcode/patches/patch-aa b/multimedia/transcode/patches/patch-aa index 8030af4f882..25e577ba3fb 100644 --- a/multimedia/transcode/patches/patch-aa +++ b/multimedia/transcode/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2006/01/24 05:35:51 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2008/11/21 17:35:12 adam Exp $ ---- Makefile.in.orig 2006-01-24 00:53:38.000000000 +0100 -+++ Makefile.in 2006-01-24 00:53:45.000000000 +0100 -@@ -405,7 +405,6 @@ +--- Makefile.in.orig 2008-11-15 10:57:34.000000000 +0100 ++++ Makefile.in +@@ -321,7 +321,6 @@ AUTOMAKE_OPTIONS = foreign @HAVE_PVM3_TRUE@PVM3 = pvm3 SUBDIRS = \ libtc \ diff --git a/multimedia/transcode/patches/patch-ac b/multimedia/transcode/patches/patch-ac index 1c463c23dd6..08929be09f6 100644 --- a/multimedia/transcode/patches/patch-ac +++ b/multimedia/transcode/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2008/09/15 12:46:44 abs Exp $ +$NetBSD: patch-ac,v 1.4 2008/11/21 17:35:12 adam Exp $ ---- configure.orig 2008-07-26 10:06:43.000000000 +0200 +--- configure.orig 2008-11-15 10:57:26.000000000 +0100 +++ configure -@@ -9833,7 +9833,7 @@ fi +@@ -9832,7 +9832,7 @@ fi case "$host_os" in @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2008/09/15 12:46:44 abs Exp $ cat >>confdefs.h <<\_ACEOF #define SYS_BSD 1 -@@ -9865,7 +9865,7 @@ case "$host" in +@@ -9864,7 +9864,7 @@ case "$host" in esac # let user override if test -n "$PTHREAD_LIBS" ; then @@ -20,3 +20,38 @@ $NetBSD: patch-ac,v 1.3 2008/09/15 12:46:44 abs Exp $ fi if test -n "$PTHREAD_CFLAGS" ; then pthread_cflags="$PTHREAD_CFLAGS" +@@ -41961,7 +41961,7 @@ echo "${ECHO_T}default" >&6; } + for l in $imagemagick_ll ; do + case $l in + -L*) lpaths="$lpaths $l" ;; +- -l*) test x"$l" != x"-lMagick" && xlibs="$xlibs $l" ;; ++ -l*) test x"$l" != x"-lMagickCore" && xlibs="$xlibs $l" ;; + *) xlf="$xlf $l" ;; + esac + done +@@ -41977,13 +41977,13 @@ echo "${ECHO_T}default" >&6; } + if test x"Magick" != x"none" ; then + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $imagemagick_ll" +- { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagick" >&5 +-echo $ECHO_N "checking for InitializeMagick in -lMagick... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagickCore" >&5 ++echo $ECHO_N "checking for InitializeMagick in -lMagickCore... $ECHO_C" >&6; } + if test "${ac_cv_lib_Magick_InitializeMagick+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lMagick $IMAGEMAGICK_EXTRA_LIBS $LIBS" ++LIBS="-lMagickCore $IMAGEMAGICK_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -42039,7 +42039,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_Magick_InitializeMagick" >&5 + echo "${ECHO_T}$ac_cv_lib_Magick_InitializeMagick" >&6; } + if test $ac_cv_lib_Magick_InitializeMagick = yes; then +- IMAGEMAGICK_LIBS="$imagemagick_ll -lMagick $IMAGEMAGICK_EXTRA_LIBS" ++ IMAGEMAGICK_LIBS="$imagemagick_ll -lMagickCore $IMAGEMAGICK_EXTRA_LIBS" + else + + tc_pkg_err="yes" diff --git a/multimedia/transcode/patches/patch-ad b/multimedia/transcode/patches/patch-ad deleted file mode 100644 index 25d7ac959cf..00000000000 --- a/multimedia/transcode/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2008/09/15 12:47:04 abs Exp $ - ---- filter/pp/filter_pp.c.orig 2005-07-04 08:23:01.000000000 +0100 -+++ filter/pp/filter_pp.c -@@ -35,7 +35,7 @@ - #include <ctype.h> - #include <inttypes.h> - --#include "postprocess.h" -+#include "libpostproc/postprocess.h" - - static pp_mode_t *mode[MAX_FILTER]; - static pp_context_t *context[MAX_FILTER]; diff --git a/multimedia/transcode/patches/patch-av b/multimedia/transcode/patches/patch-av index ba52750a16a..881bab7dabb 100644 --- a/multimedia/transcode/patches/patch-av +++ b/multimedia/transcode/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.3 2007/08/09 20:06:36 drochner Exp $ +$NetBSD: patch-av,v 1.4 2008/11/21 17:35:12 adam Exp $ ---- tools/Makefile.in.orig 2007-07-28 22:33:14.000000000 +0200 +--- tools/Makefile.in.orig 2008-11-15 10:57:34.000000000 +0100 +++ tools/Makefile.in -@@ -510,7 +510,7 @@ tcmodinfo_LDADD = \ +@@ -408,7 +408,7 @@ tcmodinfo_LDADD = \ $(DLDARWINLIB) \ $(ACLIB_LIBS) \ $(LIBTC_LIBS) \ |