Author: arekm Date: Sat Aug 1 18:51:42 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; disable asm on non x86 (nasm object files linking fails)
---- Files affected: packages/xvid: xvid.spec (1.59 -> 1.60) , xvid-ac.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xvid/xvid.spec diff -u packages/xvid/xvid.spec:1.59 packages/xvid/xvid.spec:1.60 --- packages/xvid/xvid.spec:1.59 Sat Aug 1 14:24:48 2009 +++ packages/xvid/xvid.spec Sat Aug 1 20:51:37 2009 @@ -5,7 +5,7 @@ Summary(pl.UTF-8): Implementacja kodeka wideo zgodnego ze standardem ISO MPEG-4 Name: xvid Version: 1.2.2 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: Libraries @@ -13,6 +13,7 @@ # Source0-md5: 6a3473a12c8a1fa7bdc2b5cb829fab58 # http://bugs.gentoo.org/attachment.cgi?id=108302 Patch0: xvid-1.1.2-textrel.patch +Patch1: %{name}-ac.patch URL: http://www.xvid.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -62,13 +63,21 @@ %prep %setup -q -n %{name}core #%patch0 -p1 +%patch1 -p1 %build cd build/generic +sed -i -e 's...@$(AS)#$(AS)#g' Makefile +sed -i -e 's...@$(CC)#$(CC)#g' Makefile +sed -i -e 's...@cd#cd#g' Makefile cp -f /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} -%configure +%configure \ +%ifnarch %{x86} + --disable-assembly +%endif + %{__make} %install @@ -110,6 +119,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.60 2009/08/01 18:51:37 arekm +- rel 4; disable asm on non x86 (nasm object files linking fails) + Revision 1.59 2009/08/01 12:24:48 arekm - rel 3 ================================================================ Index: packages/xvid/xvid-ac.patch diff -u /dev/null packages/xvid/xvid-ac.patch:1.1 --- /dev/null Sat Aug 1 20:51:43 2009 +++ packages/xvid/xvid-ac.patch Sat Aug 1 20:51:37 2009 @@ -0,0 +1,31 @@ +--- xvidcore/build/generic/configure.in.org 2009-05-28 19:03:45.000000000 +0200 ++++ xvidcore/build/generic/configure.in 2009-08-01 18:39:22.974453445 +0200 +@@ -585,18 +585,18 @@ + dnl ========================================================================== + + AC_CHECK_HEADER( +- pthread.h, ++ [pthread.h],[ + AC_CHECK_LIB( +- pthread, +- pthread_create, ++ [pthread], ++ [pthread_create],[ + AC_CHECK_LIB( +- pthread, +- pthread_join, +- SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" +- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread", +- AC_MSG_WARN(Pthread not supported. No SMP support)), +- AC_MSG_WARN(Pthread not supported. No SMP support)), +- AC_MSG_WARN(Pthread not supported. No SMP support)) ++ [pthread], ++ [pthread_join], ++ [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" ++ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"], ++ [AC_MSG_WARN(Pthread not supported. No SMP support)])], ++ [AC_MSG_WARN(Pthread not supported. No SMP support)])], ++ [AC_MSG_WARN(Pthread not supported. No SMP support)]) + + dnl ========================================================================== + dnl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xvid/xvid.spec?r1=1.59&r2=1.60&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
