[arch-commits] CVS update of extra/multimedia (4 files)
Tobias Kieslich
tobias at archlinux.org
Thu Apr 3 23:42:28 UTC 2008
Date: Thursday, April 3, 2008 @ 19:42:28
Author: tobias
Path: /home/cvs-extra/extra/multimedia
Added: inkscape/perl-5.10.patch (1.1)
Modified: inkscape/PKGBUILD (1.27 -> 1.28) transcode/PKGBUILD (1.33 -> 1.34)
Removed: transcode/imagemagick.patch (1.1)
rebuild for imagemagick:
inkscape: also fix the perl 5.10 issue
transcode: use the 1.0.6rc1 to avoid gcc-4.3 trouble
-----------------------------+
inkscape/PKGBUILD | 10 +++++++---
inkscape/perl-5.10.patch | 25 +++++++++++++++++++++++++
transcode/PKGBUILD | 8 ++++----
transcode/imagemagick.patch | 41 -----------------------------------------
4 files changed, 36 insertions(+), 48 deletions(-)
Index: extra/multimedia/inkscape/PKGBUILD
diff -u extra/multimedia/inkscape/PKGBUILD:1.27 extra/multimedia/inkscape/PKGBUILD:1.28
--- extra/multimedia/inkscape/PKGBUILD:1.27 Wed Mar 12 23:04:40 2008
+++ extra/multimedia/inkscape/PKGBUILD Thu Apr 3 19:42:27 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.27 2008/03/13 03:04:40 eric Exp $
+# $Id: PKGBUILD,v 1.28 2008/04/03 23:42:27 tobias Exp $
# Maintainer: tobias <tobias at archlinux.org>
# Contributor: Tobias Kieslich <tobias at justdreams.de>
pkgname=inkscape
pkgver=0.46
-pkgrel=1
+pkgrel=2
pkgdesc="A vector-based drawing program - svg compliant"
url="http://inkscape.sourceforge.net/"
arch=(i686 x86_64)
@@ -15,11 +15,13 @@
makedepends=('perlxml' 'pkgconfig' 'boost')
options=('!libtool')
install=inkscape.install
-source=("http://heanet.dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ perl-5.10.patch)
md5sums=('3bae9034047379012127e52f9b138d32')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -Np1 -i ../perl-5.10.patch || return 1
./configure --prefix=/usr \
--enable-inkboard \
--enable-lcms \
@@ -31,3 +33,5 @@
make || return 1
make DESTDIR=${startdir}/pkg install
}
+md5sums=('3bae9034047379012127e52f9b138d32'
+ 'da1009efea12f6512e69cc3ec8604f4f')
Index: extra/multimedia/inkscape/perl-5.10.patch
diff -u /dev/null extra/multimedia/inkscape/perl-5.10.patch:1.1
--- /dev/null Thu Apr 3 19:42:28 2008
+++ extra/multimedia/inkscape/perl-5.10.patch Thu Apr 3 19:42:27 2008
@@ -0,0 +1,25 @@
+diff -Naur inkscape-0.46/src/Makefile.am inkscape-0.46-p/src/Makefile.am
+--- inkscape-0.46/src/Makefile.am 2008-03-11 05:44:31.000000000 +0100
++++ inkscape-0.46-p/src/Makefile.am 2008-03-14 22:21:53.000000000 +0100
+@@ -25,7 +25,8 @@
+ $(POPPLER_GLIB_CFLAGS) \
+ -DPOTRACE=\"potrace\" \
+ $(INKSCAPE_CFLAGS) \
+- -I$(top_srcdir)/cxxtest
++ -I$(top_srcdir)/cxxtest \
++ -I$(top_srcdir)/src/extension/script
+
+ include Makefile_insert
+ include application/Makefile_insert
+diff -Naur inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp
+--- inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp 2008-03-11 05:20:25.000000000 +0100
++++ inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp 2008-03-14 22:36:24.000000000 +0100
+@@ -724,7 +724,7 @@
+ /* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */
+
+
+-typedef XS(SwigPerlWrapper);
++typedef XSPROTO(SwigPerlWrapper);
+ typedef SwigPerlWrapper *SwigPerlWrapperPtr;
+
+ /* Structure for command table */
Index: extra/multimedia/transcode/PKGBUILD
diff -u extra/multimedia/transcode/PKGBUILD:1.33 extra/multimedia/transcode/PKGBUILD:1.34
--- extra/multimedia/transcode/PKGBUILD:1.33 Fri Feb 29 19:01:21 2008
+++ extra/multimedia/transcode/PKGBUILD Thu Apr 3 19:42:27 2008
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.33 2008/03/01 00:01:21 tobias Exp $
+# $Id: PKGBUILD,v 1.34 2008/04/03 23:42:27 tobias Exp $
# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
# Maintainer: roberto <roberto at archlinux.org>
pkgname=transcode
_sripver=0.3-4
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6rc1
+pkgrel=1
pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console."
arch=(i686 x86_64)
license=('GPL2')
@@ -17,7 +17,7 @@
options=(!libtool)
source=(http://fromani.exit1.org/${pkgname}-${pkgver}.tar.bz2 \
http://dl.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('124a6055d304fa2d8577d7380e2bcb0c' 'c0bd49a88f667c68c4430ad25bbed510')
+md5sums=('ca666e74bab93fcc7f4d773b77229fad' 'c0bd49a88f667c68c4430ad25bbed510')
build() {
cd $startdir/src/$pkgname-$pkgver
Index: extra/multimedia/transcode/imagemagick.patch
diff -u extra/multimedia/transcode/imagemagick.patch:1.1 extra/multimedia/transcode/imagemagick.patch:removed
--- extra/multimedia/transcode/imagemagick.patch:1.1 Tue Jan 31 05:35:16 2006
+++ extra/multimedia/transcode/imagemagick.patch Thu Apr 3 19:42:28 2008
@@ -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("");
More information about the arch-commits
mailing list