[arch-commits] Commit in transcode/trunk (4 files)

Eric Bélanger eric at archlinux.org
Sun Jan 11 23:31:52 UTC 2009


    Date: Sunday, January 11, 2009 @ 18:31:52
  Author: eric
Revision: 24024

upgpkg: transcode 1.0.7-1
    upstream update, built against x264 20090108, built against ffmpeg 20081220, added a52dec depends, fixed imagemagick filters (close FS#11039), cleaned install scriptlet

Added:
  transcode/trunk/transcode-1.0.6-imagemagick.patch
Modified:
  transcode/trunk/PKGBUILD
  transcode/trunk/transcode.install
Deleted:
  transcode/trunk/imagemagick.patch

-----------------------------------+
 PKGBUILD                          |   17 +++++++++-----
 imagemagick.patch                 |   41 ------------------------------------
 transcode-1.0.6-imagemagick.patch |   13 +++++++++++
 transcode.install                 |   17 --------------
 4 files changed, 24 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-11 23:25:55 UTC (rev 24023)
+++ PKGBUILD	2009-01-11 23:31:52 UTC (rev 24024)
@@ -4,27 +4,32 @@
 
 pkgname=transcode
 _sripver=0.3-4
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console."
 arch=(i686 x86_64)
 license=('GPL2')
-depends=('imagemagick>=6.2.6' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools' \
-         'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264>=20080625' 'libxml2' \
-         'libxv')
+depends=('imagemagick>=6.2.6' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg>=20081220' 'mjpegtools' \
+         'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264>=20090108' 'libxml2' \
+         'libxv' 'a52dec')
 makedepends=('nasm')
 install=transcode.install
 url="http://transcoding.org"
 options=(!libtool !makeflags)
 source=(http://fromani.exit1.org/${pkgname}-${pkgver}.tar.bz2 \
-        http://dl.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('7c3a341b0e4540e34ef50c66b0ab751d' 'c0bd49a88f667c68c4430ad25bbed510')
+        http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz \
+        transcode-1.0.6-imagemagick.patch)
+md5sums=('48a57f36861450dde78d6a1ad5edf99f' 'c0bd49a88f667c68c4430ad25bbed510'\
+         '2724176f1d50125630dd553dab7cbcce')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' import/{import_ffmpeg.c,decode_lavc.c} || return 1
   sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' export/{aud_aux.c,export_ffmpeg.c,ffmpeg_cfg.h} || return 1
   sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' filter/filter_resample.c || return 1
+  patch -p1 < ../transcode-1.0.6-imagemagick.patch || return 1
+  autoconf || return 1
+
  # building from here
   ./configure --prefix=/usr \
     --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \

Deleted: imagemagick.patch
===================================================================
--- imagemagick.patch	2009-01-11 23:25:55 UTC (rev 24023)
+++ imagemagick.patch	2009-01-11 23:31:52 UTC (rev 24024)
@@ -1,41 +0,0 @@
---- transcode-1.0.1.orig/filter/filter_compare.c
-+++ transcode-1.0.1/filter/filter_compare.c
-@@ -180,6 +180,7 @@
- 			if (!(compare[instance]->results = fopen(results_name, "w")))
- 			{
- 				perror("could not open file for writing");
-+				return (-1);
- 			}
- 			
- 			InitializeMagick("");
---- transcode-1.0.1.orig/filter/filter_logo.c	2005-10-21 22:18:49.000000000 +0200
-+++ transcode-1.0.1/filter/filter_logo.c	2005-10-21 22:19:52.000000000 +0200
-@@ -183,17 +183,18 @@
- 
- 	if (optstr_get (options, "help", "") >= 0)
- 	    help_optstr();
--    }
- 
--    if (verbose > 1) {
--	printf (" Logo renderer Settings:\n");
--	printf ("              file = %s\n", mfd->file);
--	printf ("            posdef = %d\n", mfd->pos);
--	printf ("               pos = %dx%d\n", mfd->posx, mfd->posy);
--	printf ("             range = %u-%u\n", mfd->start, mfd->end);
--	printf ("              flip = %d\n", mfd->flip);
--	printf ("       ignoredelay = %d\n", mfd->ignoredelay);
--	printf ("           rgbswap = %d\n", mfd->rgbswap);
-+    	if (verbose > 1) {
-+		printf (" Logo renderer Settings:\n");
-+		printf ("              file = %s\n", mfd->file);
-+		printf ("            posdef = %d\n", mfd->pos);
-+		printf ("               pos = %dx%d\n", mfd->posx, mfd->posy);
-+		printf ("             range = %u-%u\n", mfd->start, mfd->end);
-+		printf ("              flip = %d\n", mfd->flip);
-+		printf ("       ignoredelay = %d\n", mfd->ignoredelay);
-+		printf ("           rgbswap = %d\n", mfd->rgbswap);
-+    	}
-+    return (-1);
-     }
- 
-     InitializeMagick("");

Added: transcode-1.0.6-imagemagick.patch
===================================================================
--- transcode-1.0.6-imagemagick.patch	                        (rev 0)
+++ transcode-1.0.6-imagemagick.patch	2009-01-11 23:31:52 UTC (rev 24024)
@@ -0,0 +1,13 @@
+Index: transcode-1.0.6/configure.in
+===================================================================
+--- transcode-1.0.6.orig/configure.in
++++ transcode-1.0.6/configure.in
+@@ -1247,7 +1247,7 @@ dnl
+ IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS -lz -lm"
+ dnl MagickWand libraries/headers always (?) are a superset of MagickCore ones.
+ TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, Wand-config, [magick/api.h],
+- Magick, InitializeMagick, Wand, [http://www.imagemagick.org/])
++ MagickWand, InitializeMagick, Wand, [http://www.imagemagick.org/])
+ TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
+ if test x"$have_imagemagick" = x"yes" ; then
+   AC_CHECK_HEADER([wand/magick-wand.h],

Modified: transcode.install
===================================================================
--- transcode.install	2009-01-11 23:25:55 UTC (rev 24023)
+++ transcode.install	2009-01-11 23:31:52 UTC (rev 24024)
@@ -1,23 +1,6 @@
-# arg 1:  the new package version
 post_install() {
 echo ">>"
 echo ">> Transcode currently does not work with divx4linux. Please"
 echo ">> use xvid(core) instead."
 echo ">>"
 }
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*




More information about the arch-commits mailing list