pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/transcode Update to 1.0.5: bugfixes and mis...
details: https://anonhg.NetBSD.org/pkgsrc/rev/041bcd778270
branches: trunk
changeset: 538855:041bcd778270
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Wed Feb 20 10:20:04 2008 +0000
description:
Update to 1.0.5: bugfixes and misc speedups.
diffstat:
multimedia/transcode/Makefile | 29 ++++++++++++++---------------
multimedia/transcode/PLIST | 6 +++---
multimedia/transcode/distinfo | 20 ++++----------------
multimedia/transcode/options.mk | 20 +++++++-------------
multimedia/transcode/patches/patch-ad | 12 ------------
multimedia/transcode/patches/patch-af | 13 -------------
multimedia/transcode/patches/patch-ag | 12 ------------
multimedia/transcode/patches/patch-ah | 12 ------------
multimedia/transcode/patches/patch-ai | 12 ------------
multimedia/transcode/patches/patch-ak | 13 -------------
multimedia/transcode/patches/patch-al | 12 ------------
multimedia/transcode/patches/patch-am | 12 ------------
multimedia/transcode/patches/patch-an | 12 ------------
multimedia/transcode/patches/patch-ap | 13 -------------
multimedia/transcode/patches/patch-aq | 13 -------------
multimedia/transcode/patches/patch-ar | 17 -----------------
16 files changed, 28 insertions(+), 200 deletions(-)
diffs (truncated from 387 to 300 lines):
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/Makefile
--- a/multimedia/transcode/Makefile Wed Feb 20 10:19:54 2008 +0000
+++ b/multimedia/transcode/Makefile Wed Feb 20 10:20:04 2008 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2007/12/02 11:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2008/02/20 10:20:04 xtraeme Exp $
#
-DISTNAME= transcode-1.0.3
-PKGREVISION= 1
+DISTNAME= transcode-1.0.5
+#PKGREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= http://fromani.exit1.org/ \
- http://www.jakemsr.com/transcode/
+MASTER_SITES= http://fromani.exit1.org/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= xtraeme%NetBSD.org@localhost
@@ -18,33 +17,33 @@
USE_LANGUAGES= c c++
CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q}
-CONFIGURE_ARGS+= --disable-libpostproc
-CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg}
+CONFIGURE_ARGS+= --enable-libpostproc
+CONFIGURE_ARGS+= \
+ --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg-devel}
CONFIGURE_ARGS+= --enable-oss
CONFIGURE_ARGS+= --disable-xio
+PTHREAD_AUTO_VARS= yes
+PTHREAD_OPTS= require
LIBS+= ${LIBOSSAUDIO}
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-4*)
-PLIST_SUBST+= TOMSMOCOMP='@comment '
-.else
-PLIST_SUBST+= TOMSMOCOMP=
-.endif
+post-install:
+ rm -f ${PREFIX}/lib/transcode/export_xvid.so
.include "options.mk"
+.include "../../audio/faac/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/x264-devel/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/PLIST
--- a/multimedia/transcode/PLIST Wed Feb 20 10:19:54 2008 +0000
+++ b/multimedia/transcode/PLIST Wed Feb 20 10:20:04 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/08/24 16:06:25 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/02/20 10:20:04 xtraeme Exp $
bin/avifix
bin/aviindex
bin/avimerge
@@ -44,7 +44,6 @@
lib/transcode/export_raw.la
lib/transcode/export_toolame.la
lib/transcode/export_wav.la
-lib/transcode/export_xvid.so
lib/transcode/export_xvid2.la
lib/transcode/export_xvid3.la
lib/transcode/export_xvid4.la
@@ -90,6 +89,7 @@
lib/transcode/filter_normalize.la
lib/transcode/filter_null.la
${DV}lib/transcode/filter_preview.la
+lib/transcode/filter_pp.la
lib/transcode/filter_pv.la
lib/transcode/filter_resample.la
lib/transcode/filter_skip.la
@@ -104,7 +104,7 @@
lib/transcode/filter_test.la
lib/transcode/filter_testframe.la
${FREETYPE2}lib/transcode/filter_text.la
-${TOMSMOCOMP}lib/transcode/filter_tomsmocomp.la
+lib/transcode/filter_tomsmocomp.la
lib/transcode/filter_unsharp.la
lib/transcode/filter_videocore.la
lib/transcode/filter_whitebalance.la
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/distinfo
--- a/multimedia/transcode/distinfo Wed Feb 20 10:19:54 2008 +0000
+++ b/multimedia/transcode/distinfo Wed Feb 20 10:20:04 2008 +0000
@@ -1,26 +1,14 @@
-$NetBSD: distinfo,v 1.11 2007/08/09 20:06:35 drochner Exp $
+$NetBSD: distinfo,v 1.12 2008/02/20 10:20:04 xtraeme Exp $
-SHA1 (transcode-1.0.3.tar.bz2) = 80617acac039bbab66ae36f6e11469e3f759d59e
-RMD160 (transcode-1.0.3.tar.bz2) = f7c2db91be55c14a8e59eee4467a7f6a1bd73c83
-Size (transcode-1.0.3.tar.bz2) = 1987499 bytes
+SHA1 (transcode-1.0.5.tar.bz2) = 96f8746a8d54c3ed78f0b5eb32ff7c72313e8e6b
+RMD160 (transcode-1.0.5.tar.bz2) = 7f335fa3f3df4f178b82314bfe661aa34f75e693
+Size (transcode-1.0.5.tar.bz2) = 1989934 bytes
SHA1 (patch-aa) = 01c2093ff606b4a0744dd0b8e5422277d081b8f2
SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2
SHA1 (patch-ac) = 1e5fa05a1238b8e20f7f89a8f3d1c3cda55cbe49
-SHA1 (patch-ad) = a520f32c75bb4a811be7801afbec4a783cf36c00
SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42
-SHA1 (patch-af) = 1133631c4a6c2396bf8628bfa9b2b26ad3a5b9ac
-SHA1 (patch-ag) = 00a9341dc359e88e8664c41366a72d1790466244
-SHA1 (patch-ah) = d7c52dfc0f142cad2714e184723c1546b4431f97
-SHA1 (patch-ai) = 366ebfbf3de0d4eb53104bad6645056e8b7b8397
SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75
-SHA1 (patch-ak) = d144d8c9b3188c5fcd05454e267a9931240e7c1e
-SHA1 (patch-al) = bd2720a89ecfb86d8e1cc28e87931316082a6861
-SHA1 (patch-am) = 967a7ba589386a8130e1ff2756d7e1787d40e03f
-SHA1 (patch-an) = 897e096d31db4e6602e4a0999d22f187f694f4c3
SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa
-SHA1 (patch-ap) = 29e723a35d40e66086dc5064acf471c05c3911bc
-SHA1 (patch-aq) = 8ed8767cd09d49a9d1fe210058ded77e32c59242
-SHA1 (patch-ar) = 7b25af9639cb74705335840965f46f96c8f1a9e1
SHA1 (patch-as) = f52658ae005ad3d68134a33878eb634e949a269a
SHA1 (patch-at) = 60e6c507049e3fd1723440859b90e828aac968ad
SHA1 (patch-au) = 3d06c68c60cda13d235a440b13a07d11b8de7877
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/options.mk
--- a/multimedia/transcode/options.mk Wed Feb 20 10:19:54 2008 +0000
+++ b/multimedia/transcode/options.mk Wed Feb 20 10:20:04 2008 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2006/01/25 08:53:34 xtraeme Exp $
+# $NetBSD: options.mk,v 1.3 2008/02/20 10:20:04 xtraeme Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.transcode
PKG_SUPPORTED_OPTIONS= a52 freetype2 mjpegtools mpeg3 lzo libxml2
-PKG_SUPPORTED_OPTIONS+= dv gtk imagemagick
+PKG_SUPPORTED_OPTIONS+= dv imagemagick
-PKG_SUGGESTED_OPTIONS= a52 freetype2 mjpegtools mpeg3 libxml2 imagemagick
+PKG_SUGGESTED_OPTIONS= a52 freetype2 mjpegtools mpeg3 libxml2
+PKG_SUGGESTED_OPTIONS+= imagemagick
.include "../../mk/bsd.options.mk"
@@ -38,8 +39,10 @@
.endif
.if !empty(PKG_OPTIONS:Mmpeg3)
+BUILDLINK_API_DEPENDS.libmpeg3+= libmpeg3>=1.7
PLIST_SUBST+= MPEG3=
. include "../../multimedia/libmpeg3/buildlink3.mk"
+CONFIGURE_ARGS+= --with-libmpeg3-prefix=${BUILDLINK_PREFIX.libmpeg3}
CONFIGURE_ARGS+= --enable-libmpeg3
.else
PLIST_SUBST+= MPEG3='@comment '
@@ -50,7 +53,7 @@
PLIST_SUBST+= LZO=
. include "../../archivers/lzo/buildlink3.mk"
CONFIGURE_ARGS+= --enable-lzo
-CONFIGURE_ARGS+= --with-lzo-includes=${BUILDLINK_PREFIX.lzo}/include/lzo
+CONFIGURE_ARGS+= --with-lzo-prefix==${BUILDLINK_PREFIX.lzo}
.else
PLIST_SUBST+= LZO='@comment '
CONFIGURE_ARGS+= --disable-lzo
@@ -74,15 +77,6 @@
CONFIGURE_ARGS+= --disable-libdv
.endif
-.if !empty(PKG_OPTIONS:Mgtk)
-PLIST_SUBST+= GTK=
-. include "../../x11/gtk/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gtk
-.else
-PLIST_SUBST+= GTK='@comment '
-CONFIGURE_ARGS+= --disable-gtk
-.endif
-
.if !empty(PKG_OPTIONS:Mimagemagick)
PLIST_SUBST+= IMAGEMAGICK=
. include "../../graphics/ImageMagick/buildlink3.mk"
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-ad
--- a/multimedia/transcode/patches/patch-ad Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_avi.c.orig 2006-03-13 18:15:40.000000000 +0000
-+++ import/import_avi.c
-@@ -60,7 +60,6 @@ MOD_open
- struct stat fbuf;
- char import_cmd_buf[TC_BUF_MAX];
- long sret;
-- extern int errno;
-
- param->fd = NULL;
-
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-af
--- a/multimedia/transcode/patches/patch-af Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/ioaux.c.orig 2006-03-13 18:21:14.000000000 +0000
-+++ import/ioaux.c
-@@ -28,8 +28,6 @@
- #define MAX_BUF 4096
- static uint8_t buffer[MAX_BUF]; /* only used in p_readwrite() */
-
--extern int errno;
--
-
- ssize_t p_read(int fd, uint8_t *buf, size_t len)
- {
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-ag
--- a/multimedia/transcode/patches/patch-ag Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_ac3.c.orig 2006-03-13 18:24:00.000000000 +0000
-+++ import/import_ac3.c
-@@ -36,7 +36,6 @@ static int capability_flag = TC_CAP_PCM
- #include "ac3scan.h"
-
-
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
-
- static FILE *fd;
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-ah
--- a/multimedia/transcode/patches/patch-ah Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_dv.c.orig 2006-03-13 18:24:25.000000000 +0000
-+++ import/import_dv.c
-@@ -36,7 +36,6 @@ static int capability_flag = TC_CAP_RGB
- #include "import_def.h"
-
-
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
-
- static int frame_size=0;
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-ai
--- a/multimedia/transcode/patches/patch-ai Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_lav.c.orig 2006-03-13 18:25:33.000000000 +0000
-+++ import/import_lav.c
-@@ -34,7 +34,6 @@ static int capability_flag = TC_CAP_RGB
- #include "import_def.h"
-
-
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
-
-
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-ak
--- a/multimedia/transcode/patches/patch-ak Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_im.c.orig 2006-03-13 18:32:28.000000000 +0000
-+++ import/import_im.c
-@@ -46,8 +46,6 @@ static int capability_flag = TC_CAP_RGB
- #include <magick/api.h>
-
-
--extern int errno;
--
- char
- *head = NULL,
- *tail = NULL;
diff -r c0b2f6110ecd -r 041bcd778270 multimedia/transcode/patches/patch-al
--- a/multimedia/transcode/patches/patch-al Wed Feb 20 10:19:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_mplayer.c.orig 2006-03-13 18:34:58.000000000 +0000
-+++ import/import_mplayer.c
-@@ -36,7 +36,6 @@ static int capability_flag = TC_CAP_YUV
- #include <sys/types.h>
-
-
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
-
- static const char * videopipe = "./stream.yuv";
Home |
Main Index |
Thread Index |
Old Index