[arch-commits] Commit in transcode/trunk (PKGBUILD transcode-1.0.6-imagemagick.patch)

[Eric Bélanger]

    Date: Sunday, January 18, 2009 @ 23:53:36
  Author: eric
Revision: 24605

upgpkg: transcode 1.1.0-1
    upstream update, removed old patch

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

-----------------------------------+
 PKGBUILD                          |   12 +++++-------
 transcode-1.0.6-imagemagick.patch |   13 -------------
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-19 04:50:41 UTC (rev 24604)
+++ PKGBUILD	2009-01-19 04:53:36 UTC (rev 24605)
@@ -4,7 +4,7 @@
 
 pkgname=transcode
 _sripver=0.3-4
-pkgver=1.0.7
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console."
 arch=(i686 x86_64)
@@ -17,17 +17,14 @@
 url="http://transcoding.org"
 options=(!libtool !makeflags)
 source=(http://fromani.exit1.org/${pkgname}-${pkgver}.tar.bz2 \
-        http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz \
-        transcode-1.0.6-imagemagick.patch)
-md5sums=('48a57f36861450dde78d6a1ad5edf99f' 'c0bd49a88f667c68c4430ad25bbed510'\
-         '2724176f1d50125630dd553dab7cbcce')
+        http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
+md5sums=('5ca205e32b546402a48ea8004a7b3232' 'c0bd49a88f667c68c4430ad25bbed510')
 
 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
@@ -53,7 +50,8 @@
   make DESTDIR=$startdir/pkg install
  ##############################################################################
  # this imports the latest subtitleripper sources and replaces the internal
-  rm -rf $startdir/src/$pkgname-$pkgver/contrib/subrip
+###  rm -rf $startdir/src/$pkgname-$pkgver/contrib/subrip
+  mkdir $startdir/src/$pkgname-$pkgver/contrib
   tar xzf ../subtitleripper-$_sripver.tgz -C $startdir/src/$pkgname-$pkgver/contrib
   mv $startdir/src/$pkgname-$pkgver/contrib/subtitleripper \
     $startdir/src/$pkgname-$pkgver/contrib/subrip

Deleted: transcode-1.0.6-imagemagick.patch
===================================================================
--- transcode-1.0.6-imagemagick.patch	2009-01-19 04:50:41 UTC (rev 24604)
+++ transcode-1.0.6-imagemagick.patch	2009-01-19 04:53:36 UTC (rev 24605)
@@ -1,13 +0,0 @@
-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],