From 1f0be1049bf62a20372575ca0021b4eedda0eb68 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 14 Apr 2004 10:02:10 +0000 Subject: [PATCH] Merged from http://svn.rocklinux-consulting.de/rock-linux/branches/2.0-stable/: r2752 | rene | 2004-04-14 11:59:24 +0200 (Wed, 14 Apr 2004) | 10 lines Rene Rebe: -fixed gtkpbbuttons build priority -disabled alleyoop, batfink and hotapplet on powerpc (no lm_sensors and apm fluff there ...) -fixed gstreamer to compile on powerpc (functionallity needs to be tested later) -fixed mplayer for powerpc (disabling all the non-compiling altivec code -fixed ffmpeg to compile (for the without imlib2 case) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2753 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome24/alleyoop/alleyoop.desc | 2 ++ package/gnome24/battfink/battfink.desc | 2 ++ .../gnome24/gstreamer/ugly-powerpc-asm.patch | 25 +++++++++++++++++++ package/gnome24/hotapplet/hotapplet.desc | 2 ++ package/jimmy/mplayer/mplayer.conf | 16 +++++++++--- .../powerpc/gtkpbbuttons/gtkpbbuttons.desc | 2 +- package/rene/ffmpeg/compile.patch | 18 +++++++++++++ 7 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 package/gnome24/gstreamer/ugly-powerpc-asm.patch create mode 100644 package/rene/ffmpeg/compile.patch diff --git a/package/gnome24/alleyoop/alleyoop.desc b/package/gnome24/alleyoop/alleyoop.desc index 342736a6d..52c789ce7 100644 --- a/package/gnome24/alleyoop/alleyoop.desc +++ b/package/gnome24/alleyoop/alleyoop.desc @@ -37,6 +37,8 @@ [C] extra/development extra/desktop/gnome +[R] - powerpc + [L] GPL [S] Beta [V] 0.8.1 diff --git a/package/gnome24/battfink/battfink.desc b/package/gnome24/battfink/battfink.desc index fef57ce56..86a6af7e4 100644 --- a/package/gnome24/battfink/battfink.desc +++ b/package/gnome24/battfink/battfink.desc @@ -35,6 +35,8 @@ [C] extra/configuration extra/desktop/gnome +[R] - powerpc + [L] GPL [S] Beta [V] 0.6.2 diff --git a/package/gnome24/gstreamer/ugly-powerpc-asm.patch b/package/gnome24/gstreamer/ugly-powerpc-asm.patch new file mode 100644 index 000000000..2012ecaa0 --- /dev/null +++ b/package/gnome24/gstreamer/ugly-powerpc-asm.patch @@ -0,0 +1,25 @@ + +Somehow some PowerPC expert manage to write uncompileable __asm__ inline code. +This does compile - but is unintentional. I do not know if it does the right +thing (and need to do some leasons in PowerPC assempbly and GCC inline +assembly specifically). + + - Rene Rebe + +--- gstreamer-0.6.5-orig/gst/gstarch.h 2003-09-23 02:12:34.000000000 +0200 ++++ gstreamer-0.6.5-fixed/gst/gstarch.h 2004-04-12 00:41:19.000000000 +0200 +@@ -46,11 +46,11 @@ + #elif defined (HAVE_CPU_PPC) && defined(__GNUC__) + + #define GST_ARCH_SET_SP(stackpointer) \ +- __asm__("lwz r1,%0" : : "m"(stackpointer) ) ++ __asm__("lwz 1,%0" : : "m"(stackpointer) ) + + #define GST_ARCH_CALL(target) \ +- __asm__( "mr r0,%0\n\t" \ +- "mtlr r0\n\t" \ ++ __asm__( "mr %0,%0\n\t" \ ++ "mtlr %0\n\t" \ + "blrl" : : "r"(target) : "r0" ); + + struct minimal_ppc_stackframe { diff --git a/package/gnome24/hotapplet/hotapplet.desc b/package/gnome24/hotapplet/hotapplet.desc index 53ba88cec..0942de7b7 100644 --- a/package/gnome24/hotapplet/hotapplet.desc +++ b/package/gnome24/hotapplet/hotapplet.desc @@ -34,6 +34,8 @@ [C] extra/tool extra/desktop/gnome +[R] - powerpc + [L] GPL [S] Beta [V] 0.2.2 diff --git a/package/jimmy/mplayer/mplayer.conf b/package/jimmy/mplayer/mplayer.conf index 12163c2c5..1e6b77ffa 100644 --- a/package/jimmy/mplayer/mplayer.conf +++ b/package/jimmy/mplayer/mplayer.conf @@ -20,6 +20,15 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +mplayer_premake() { + # disable all crappy altivec code the hard way (look into the configure + # to see why we need to do it this way. Hopefully at one day all + # the altivec crap code will compile ... -ReneR + sed -i 's/TARGET_ALTIVEC = yes/TARGET_ALTIVEC = /' config.mak + sed -i -e 's/#define HAVE_ALTIVEC 1/#undef HAVE_ALTIVEC/' \ + -e 's/#define HAVE_ALTIVEC_H 1/#undef HAVE_ALTIVEC_H/' config.h +} + mplayer_postmake() { if [ -f $root/var/adm/packages/gtk+12 ] ; then echo "extracting the default GUI ..." @@ -74,10 +83,11 @@ if test "$ROCKCFG_PKG_MPLAYER_BLINKENLIGHTS" != 0 ; then var_append confopt " " "--enable-bl" fi -test -f $root/var/adm/packages/rtsp && var_append confopt " " "--enable-live" -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" +pkginstalled rtsp && var_append confopt " " "--enable-live" +pkginstalled xmms && var_append confopt " " "--enable-xmms" +pkginstalled gtk+12 && var_append confopt " " "--enable-gui" test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n" +hook_add premake 3 mplayer_premake hook_add postmake 5 mplayer_postmake diff --git a/package/powerpc/gtkpbbuttons/gtkpbbuttons.desc b/package/powerpc/gtkpbbuttons/gtkpbbuttons.desc index 06c20ed4f..c63aae081 100644 --- a/package/powerpc/gtkpbbuttons/gtkpbbuttons.desc +++ b/package/powerpc/gtkpbbuttons/gtkpbbuttons.desc @@ -36,7 +36,7 @@ [L] GPL [S] Beta [V] 0.6.1 -[P] X -----5---9 722.000 +[P] X -----5---9 723.000 [D] 4148019922 gtkpbbuttons-0.6.1.tar.gz http://www.cymes.de/members/joker/projects/pbbuttons/tar/ diff --git a/package/rene/ffmpeg/compile.patch b/package/rene/ffmpeg/compile.patch new file mode 100644 index 000000000..a8866e42f --- /dev/null +++ b/package/rene/ffmpeg/compile.patch @@ -0,0 +1,18 @@ + +Well in soem way X11 libs are missing if ffmep is compiled without +imlib2 support - maintainers could also test their stuff ... + + - Rene Rebe + +--- ffmpeg-0.4.8/Makefile 2003-09-28 17:26:39.000000000 +0200 ++++ ffmpeg-0.4.8-fixed/Makefile 2004-04-11 22:58:56.000000000 +0200 +@@ -14,6 +14,9 @@ + LDFLAGS+=-p + endif + ++# ReneR: well the maintainer could also test his ... without imlib2 support ++EXTRALIBS+=-L/usr/X11/lib -lX11 ++ + PROG=ffmpeg$(EXESUF) + PROGTEST=output_example$(EXESUF) +