diff --git a/package/jimmy/mplayer/mplayer.conf b/package/jimmy/mplayer/mplayer.conf index ae96daed8..a29543384 100644 --- a/package/jimmy/mplayer/mplayer.conf +++ b/package/jimmy/mplayer/mplayer.conf @@ -56,9 +56,11 @@ mplayer_postmake() { } sysconfdir="$sysconfdir/mplayer" -confopt="--prefix=$root/$prefix --confdir=$sysconfdir --enable-menu" -confopt="$confopt --enable-linux-devfs --with-extraincdir=/usr/include/libpng" -confopt="$confopt --enable-fbdev --enable-largefiles --enable-shared-pp" +confopt="--prefix=$root/$prefix --confdir=$sysconfdir" + +var_append confopt " " "--enable-linux-devfs --enable-menu \ +--with-extraincdir=/usr/include/libpng \ +--enable-fbdev --enable-largefiles --enable-shared-pp" if [ $arch = x86 ] ; then var_append confopt " " "--with-win32libdir=$root/$prefix/lib/win32" @@ -77,5 +79,5 @@ test -f $root/var/adm/packages/xmms && var_append confopt " " "--enable-xmms" test -f $root/var/adm/packages/gtk+12 && var_append confopt " " "--enable-gui" test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n" -postmake=mplayer_postmake +hook_add postmake 5 mplayer_postmake diff --git a/package/jimmy/mplayer/no-altivec.patch b/package/jimmy/mplayer/no-altivec.patch new file mode 100644 index 000000000..f69f47ae7 --- /dev/null +++ b/package/jimmy/mplayer/no-altivec.patch @@ -0,0 +1,18 @@ +--- ./cpudetect.c.orig 2004-01-21 14:52:42.000000000 +0100 ++++ ./cpudetect.c 2004-01-21 14:57:28.000000000 +0100 +@@ -551,6 +551,7 @@ + /* no Darwin, do it the brute-force way */ + /* this is borrowed from the libmpeg2 library */ + { ++ /* + signal (SIGILL, sigill_handler); + if (sigsetjmp (jmpbuf, 1)) { + signal (SIGILL, SIG_DFL); +@@ -565,6 +566,7 @@ + signal (SIGILL, SIG_DFL); + caps->hasAltiVec = 1; + } ++ */ + } + #endif /* SYS_DARWIN */ + mp_msg(MSGT_CPUDETECT,MSGL_INFO,"AltiVec %sfound\n", (caps->hasAltiVec ? "" : "not "));