[arch-commits] Commit in transcode/repos (14 files)

Ionut Biru ibiru at archlinux.org
Fri Jan 27 20:01:33 UTC 2012


    Date: Friday, January 27, 2012 @ 15:01:33
  Author: ibiru
Revision: 147746

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  transcode/repos/extra-i686/PKGBUILD
    (from rev 147745, transcode/trunk/PKGBUILD)
  transcode/repos/extra-i686/ffmpeg-0.10.patch
    (from rev 147745, transcode/trunk/ffmpeg-0.10.patch)
  transcode/repos/extra-i686/subtitleripper-0.3.4-linkingorder.patch
    (from rev 147745, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/extra-i686/subtitleripper-0.3.4-respect-ldflags.patch
    (from rev 147745, transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
  transcode/repos/extra-x86_64/PKGBUILD
    (from rev 147745, transcode/trunk/PKGBUILD)
  transcode/repos/extra-x86_64/ffmpeg-0.10.patch
    (from rev 147745, transcode/trunk/ffmpeg-0.10.patch)
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-linkingorder.patch
    (from rev 147745, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch
    (from rev 147745, transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
Deleted:
  transcode/repos/extra-i686/PKGBUILD
  transcode/repos/extra-i686/subtitleripper-0.3.4-linkingorder.patch
  transcode/repos/extra-i686/subtitleripper-0.3.4-respect-ldflags.patch
  transcode/repos/extra-x86_64/PKGBUILD
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-linkingorder.patch
  transcode/repos/extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch

---------------------------------------------------------+
 extra-i686/PKGBUILD                                     |  118 +++++++-------
 extra-i686/ffmpeg-0.10.patch                            |   14 +
 extra-i686/subtitleripper-0.3.4-linkingorder.patch      |   56 +++---
 extra-i686/subtitleripper-0.3.4-respect-ldflags.patch   |   56 +++---
 extra-x86_64/PKGBUILD                                   |  118 +++++++-------
 extra-x86_64/ffmpeg-0.10.patch                          |   14 +
 extra-x86_64/subtitleripper-0.3.4-linkingorder.patch    |   56 +++---
 extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch |   56 +++---
 8 files changed, 262 insertions(+), 226 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-i686/PKGBUILD	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: roberto <roberto at archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=1
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}

Copied: transcode/repos/extra-i686/PKGBUILD (from rev 147745, transcode/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer:
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: roberto <roberto at archlinux.org>
+
+pkgname=transcode
+_sripver=0.3-4
+pkgver=1.1.7
+pkgrel=3
+pkgdesc="A video/DVD ripper and encoder for the terminal/console"
+arch=('i686' 'x86_64')
+url="http://tcforge.berlios.de/"
+license=('GPL')
+depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
+	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
+makedepends=('nasm')
+options=('!libtool')
+source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
+	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
+        ffmpeg-0.10.patch)
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
+          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
+          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
+          '591943a33235342a66c3df0625a164a1479c09ae'
+          '3c03111cfae88db918afff3837cec7db32ace3cc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
+  ./configure --prefix=/usr \
+    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
+    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
+    --enable-libdv --enable-libxml2 --enable-v4l \
+    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
+    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
+    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
+  make
+
+  cd "${srcdir}/subtitleripper"
+  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
+  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
+  sed -e 's|^\(.*lppm.*\)$|#\1|' \
+      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+      -i Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/subtitleripper"
+  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
+  install -m 755 srttool "${pkgdir}/usr/bin/"
+  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
+  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
+  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
+}

Copied: transcode/repos/extra-i686/ffmpeg-0.10.patch (from rev 147745, transcode/trunk/ffmpeg-0.10.patch)
===================================================================
--- extra-i686/ffmpeg-0.10.patch	                        (rev 0)
+++ extra-i686/ffmpeg-0.10.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,14 @@
+diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
+--- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
++++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 

Deleted: extra-i686/subtitleripper-0.3.4-linkingorder.patch
===================================================================
--- extra-i686/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-i686/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:

Copied: transcode/repos/extra-i686/subtitleripper-0.3.4-linkingorder.patch (from rev 147745, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
===================================================================
--- extra-i686/subtitleripper-0.3.4-linkingorder.patch	                        (rev 0)
+++ extra-i686/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:

Deleted: extra-i686/subtitleripper-0.3.4-respect-ldflags.patch
===================================================================
--- extra-i686/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-i686/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:

Copied: transcode/repos/extra-i686/subtitleripper-0.3.4-respect-ldflags.patch (from rev 147745, transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
===================================================================
--- extra-i686/subtitleripper-0.3.4-respect-ldflags.patch	                        (rev 0)
+++ extra-i686/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-x86_64/PKGBUILD	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: roberto <roberto at archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=1
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}

Copied: transcode/repos/extra-x86_64/PKGBUILD (from rev 147745, transcode/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer:
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: roberto <roberto at archlinux.org>
+
+pkgname=transcode
+_sripver=0.3-4
+pkgver=1.1.7
+pkgrel=3
+pkgdesc="A video/DVD ripper and encoder for the terminal/console"
+arch=('i686' 'x86_64')
+url="http://tcforge.berlios.de/"
+license=('GPL')
+depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
+	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
+makedepends=('nasm')
+options=('!libtool')
+source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
+	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
+        ffmpeg-0.10.patch)
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
+          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
+          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
+          '591943a33235342a66c3df0625a164a1479c09ae'
+          '3c03111cfae88db918afff3837cec7db32ace3cc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
+  ./configure --prefix=/usr \
+    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
+    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
+    --enable-libdv --enable-libxml2 --enable-v4l \
+    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
+    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
+    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
+  make
+
+  cd "${srcdir}/subtitleripper"
+  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
+  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
+  sed -e 's|^\(.*lppm.*\)$|#\1|' \
+      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+      -i Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/subtitleripper"
+  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
+  install -m 755 srttool "${pkgdir}/usr/bin/"
+  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
+  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
+  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
+}

Copied: transcode/repos/extra-x86_64/ffmpeg-0.10.patch (from rev 147745, transcode/trunk/ffmpeg-0.10.patch)
===================================================================
--- extra-x86_64/ffmpeg-0.10.patch	                        (rev 0)
+++ extra-x86_64/ffmpeg-0.10.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,14 @@
+diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
+--- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
++++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 

Deleted: extra-x86_64/subtitleripper-0.3.4-linkingorder.patch
===================================================================
--- extra-x86_64/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-x86_64/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:

Copied: transcode/repos/extra-x86_64/subtitleripper-0.3.4-linkingorder.patch (from rev 147745, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
===================================================================
--- extra-x86_64/subtitleripper-0.3.4-linkingorder.patch	                        (rev 0)
+++ extra-x86_64/subtitleripper-0.3.4-linkingorder.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:

Deleted: extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch
===================================================================
--- extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 19:59:48 UTC (rev 147745)
+++ extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:

Copied: transcode/repos/extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch (from rev 147745, transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
===================================================================
--- extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch	                        (rev 0)
+++ extra-x86_64/subtitleripper-0.3.4-respect-ldflags.patch	2012-01-27 20:01:33 UTC (rev 147746)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:




More information about the arch-commits mailing list