diff options
author | Koen Kooi <koen@openembedded.org> | 2007-03-30 17:49:35 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-03-30 17:49:35 +0000 |
commit | f2ddbcc43d7515d14d9d7ffb6d6b6ed3dcd1881d (patch) | |
tree | 281f82be333a50fe5fd5ad904ab4a6f33c005707 | |
parent | 2df3b015934b915f58a4bde3e3b60b630b6650e2 (diff) | |
parent | 84b73c36e73e10b7fb44c762baebf00763a734a2 (diff) |
merge of '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
and 'ff4cec497cf85d040a1be5d8659847f858cdd4c9'
-rw-r--r-- | packages/mplayer/files/powerpc-is-ppc.diff | 11 | ||||
-rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/packages/mplayer/files/powerpc-is-ppc.diff b/packages/mplayer/files/powerpc-is-ppc.diff new file mode 100644 index 0000000000..f8143c460e --- /dev/null +++ b/packages/mplayer/files/powerpc-is-ppc.diff @@ -0,0 +1,11 @@ +--- /tmp/configure 2007-03-30 19:40:34.000000000 +0200 ++++ MPlayer-1.0rc1/configure 2007-03-30 19:40:58.795251000 +0200 +@@ -1213,7 +1213,7 @@ + _optimizing='' + ;; + +- ppc) ++ ppc|powerpc) + _def_arch='#define ARCH_POWERPC 1' + _def_dcbzl='#define NO_DCBZL 1' + _target_arch='TARGET_ARCH_POWERPC = yes' diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 3a388d21e3..2910cbd0a4 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1 \ + file://powerpc-is-ppc.diff;patch=1 \ file://pxa_configure.patch;patch=1 \ file://pxa-video_out.patch;patch=1 " @@ -33,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r11" +PR = "r12" PARALLEL_MAKE = "" |