diff options
| author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 02:15:30 +0000 |
|---|---|---|
| committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 02:15:30 +0000 |
| commit | 54834f8b02ef53419b459ebe6b93ef3119ed98ae (patch) | |
| tree | 86902373df8cc86a98f5d4de4f20e49c76d2f762 /others | |
| parent | ed2f3dd5e8aa9b202042355173c60108202ec545 (diff) | |
| download | slackbuilds-54834f8b02ef53419b459ebe6b93ef3119ed98ae.tar.gz slackbuilds-54834f8b02ef53419b459ebe6b93ef3119ed98ae.tar.bz2 | |
libx264 fix and version bump
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1028 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'others')
| -rw-r--r-- | others/libx264/libx264-noaltivecfix.patch | 11 | ||||
| -rw-r--r-- | others/libx264/libx264-nommxfix.patch | 11 | ||||
| -rwxr-xr-x | others/libx264/libx264.SlackBuild | 16 |
3 files changed, 36 insertions, 2 deletions
diff --git a/others/libx264/libx264-noaltivecfix.patch b/others/libx264/libx264-noaltivecfix.patch new file mode 100644 index 00000000..bf2616c1 --- /dev/null +++ b/others/libx264/libx264-noaltivecfix.patch @@ -0,0 +1,11 @@ +--- configure.old 2007-02-25 18:53:19.000000000 +0000 ++++ configure 2007-02-25 19:02:07.000000000 +0000 +@@ -163,7 +163,7 @@ + then + CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" + else +- CFLAGS="$CFLAGS -maltivec -mabi=altivec" ++ CFLAGS="$CFLAGS " + fi + ;; + sparc) diff --git a/others/libx264/libx264-nommxfix.patch b/others/libx264/libx264-nommxfix.patch new file mode 100644 index 00000000..6b3309c1 --- /dev/null +++ b/others/libx264/libx264-nommxfix.patch @@ -0,0 +1,11 @@ +--- configure.old 2007-02-25 18:53:19.000000000 +0000 ++++ configure 2007-02-25 18:55:31.000000000 +0000 +@@ -138,7 +138,7 @@ + case "${MACHINE%%-*}" in + i*86) + ARCH="X86" +- CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" ++ CFLAGS="$CFLAGS " + AS="nasm" + ASFLAGS="-O2" + if [ "$SYS" = MACOSX ]; then diff --git a/others/libx264/libx264.SlackBuild b/others/libx264/libx264.SlackBuild index 5bf1ec47..ef5191aa 100755 --- a/others/libx264/libx264.SlackBuild +++ b/others/libx264/libx264.SlackBuild @@ -27,7 +27,7 @@ fi # default settings PACKAGE="libx264" ARCH=${ARCH:=i486} -VERSION=${VERSION:=20061004} +VERSION=${VERSION:=20070225} BUILD=${BUILD:=1rd} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} @@ -72,7 +72,19 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p1 < $CWD/$PACKAGE-$VERSION.diff fi -./configure --prefix=/usr --enable-shared --enable-visualize --enable-pic --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION + +# These hacks are needed because x264 do not correcly accepts CFLAGS not ac_options for optimized code. + +if [ "$ARCH" == "i486" ] || [ "$ARCH" == "i386" ]; then + patch -p0 < $CWD/$PACKAGE-nommxfix.patch +fi + +if [ "$ARCH" == "powerpc" ] && [ "$HAVE_ALTIVEC" != "true" ]; then + patch -p0 < $CWD/$PACKAGE-noaltivecfix.patch +fi + + +./configure --prefix=/usr --enable-shared --enable-visualize --enable-pic --libdir=$LIBDIR make || exit 32 make DESTDIR=$TMP/package-$PACKAGE install |