[arch-commits] CVS update of extra/multimedia/mjpegtools (2 files)

[andyrtr at archlinux.org]

    Date: Sunday, July 1, 2007 @ 14:22:17
  Author: andyrtr
    Path: /home/cvs-extra/extra/multimedia/mjpegtools

   Added: mjpegtools-1.8.0-parallelmake.patch (1.1)
Modified: PKGBUILD (1.10 -> 1.11)

rebuild for x86_64; fixed parallel build and architexture flags


-------------------------------------+
 PKGBUILD                            |   15 ++++----
 mjpegtools-1.8.0-parallelmake.patch |   60 ++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 7 deletions(-)


Index: extra/multimedia/mjpegtools/PKGBUILD
diff -u extra/multimedia/mjpegtools/PKGBUILD:1.10 extra/multimedia/mjpegtools/PKGBUILD:1.11
--- extra/multimedia/mjpegtools/PKGBUILD:1.10	Sat Jun 30 06:10:47 2007
+++ extra/multimedia/mjpegtools/PKGBUILD	Sun Jul  1 14:22:17 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.10 2007/06/30 10:10:47 jgc Exp $
+# $Id: PKGBUILD,v 1.11 2007/07/01 18:22:17 andyrtr Exp $
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 # Mantainer: Roberto Carvajal <roberto at archlinux.org>
 
@@ -11,17 +11,18 @@
 url="http://mjpeg.sourceforge.net/"
 depends=('libjpeg' 'libpng' 'sdl' 'gcc' 'libdv')
 makedepends=('gtk2')
-options=('!makeflags' '!libtool')
+options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-	mjpegtools-1.8.0-gcc41.patch)
-md5sums=('6fd98362310480bdaf7171e9659f165f' '803eccd889c60a442ee23ba65951fadc')
-
+	mjpegtools-1.8.0-gcc41.patch mjpegtools-1.8.0-parallelmake.patch)
+md5sums=('6fd98362310480bdaf7171e9659f165f'
+         '803eccd889c60a442ee23ba65951fadc'
+         '78e3f74445e8ab3c4e3f171cfb21a17f')
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
   patch -Np1 -i ${startdir}/src/mjpegtools-1.8.0-gcc41.patch || return 1
+  patch -Np1 -i ${startdir}/src/mjpegtools-1.8.0-parallelmake.patch || return 1
   ./configure --prefix=/usr
-  find -name Makefile -exec sed -i -e 's:-march=k8 -mtune=k8::' -e 's:-march=pentium3 -mtune=pentium3::' {} \;
-
   make || return 1
   make DESTDIR=${startdir}/pkg install
 
Index: extra/multimedia/mjpegtools/mjpegtools-1.8.0-parallelmake.patch
diff -u /dev/null extra/multimedia/mjpegtools/mjpegtools-1.8.0-parallelmake.patch:1.1
--- /dev/null	Sun Jul  1 14:22:17 2007
+++ extra/multimedia/mjpegtools/mjpegtools-1.8.0-parallelmake.patch	Sun Jul  1 14:22:17 2007
@@ -0,0 +1,60 @@
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.am
+@@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL
+ 
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+-	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
++	libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.in
+@@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP
+ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+-	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
++	libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mplex/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.am
++++ mjpegtools-1.8.0/mplex/Makefile.am
+@@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp 
+ 
+ mplex_LDADD = \
+-	$(top_builddir)/mplex/libmplex2.la \
++	libmplex2.la \
+ 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
+Index: mjpegtools-1.8.0/mplex/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.in
++++ mjpegtools-1.8.0/mplex/Makefile.in
+@@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_mplex_OBJECTS = main.$(OBJEXT)
+ mplex_OBJECTS = $(am_mplex_OBJECTS)
+ am__DEPENDENCIES_2 =
+-mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \
+-	$(am__DEPENDENCIES_2)
++mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp 
+ mplex_LDADD = \
+-	$(top_builddir)/mplex/libmplex2.la \
++	libmplex2.la \
+ 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
+ 
+ all: all-am