diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-06-30 22:58:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-30 22:58:59 +0000 |
| commit | 2693e3f6660fd691621600d1dc0245e1f9932b43 (patch) | |
| tree | ecef0a514d978fdc053e1ed062f22306f2ec8772 | |
| parent | 2670e8b9c2ddc45839d9bd2dfab24248b967cf27 (diff) | |
mplayer_1.0pre8.bb : small change in the include order that should
hopefully fix the problem hrw saw in oz354x branch. I am unable to
repeat in .dev but I had these patches in an earlier release for a
very similiar error message.
4 files changed, 29 insertions, 1 deletions
diff --git a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty diff --git a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch new file mode 100644 index 0000000000..619c4b0cd2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch @@ -0,0 +1,13 @@ +--- MPlayer-1.0pre8/libmpcodecs/Makefile.orig 2006-06-30 23:26:33.000000000 +0100 ++++ MPlayer-1.0pre8/libmpcodecs/Makefile 2006-06-30 23:28:52.000000000 +0100 +@@ -267,8 +267,8 @@ + SRCS2=$(ENCODER_SRCS) + OBJS2=$(SRCS2:.c=.o) + +-CFLAGS = $(OPTFLAGS) \ +- -I. -I.. \ ++CFLAGS = -I.. $(OPTFLAGS) \ ++ -I. \ + -Inative \ + -I../libmpdemux \ + -I../loader \ diff --git a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch new file mode 100644 index 0000000000..541f4a03ee --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch @@ -0,0 +1,13 @@ +--- MPlayer-1.0pre8/libmpdemux/Makefile.orig 2006-06-30 23:26:49.000000000 +0100 ++++ MPlayer-1.0pre8/libmpdemux/Makefile 2006-06-30 23:27:10.000000000 +0100 +@@ -156,8 +156,8 @@ + + OBJS = $(SRCS:.c=.o) + OBJS += $(CPLUSPLUSSRCS:.cpp=.o) +-INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) +-CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) ++INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) ++CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) + CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS + CPLUSPLUS = $(CC) + diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index a55c59dc96..9c66221f57 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -13,7 +13,9 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://w100-configure.patch;patch=1 \ file://w100-Makefile.patch;patch=1 \ file://w100-video_out.patch;patch=1 \ - file://w100-mplayer.patch;patch=1" + file://w100-mplayer.patch;patch=1 \ + file://libmpdemux-ogg-include.patch;patch=1 \ + file://libmpcodecs-ogg-include.patch;patch=1" MAINTAINER="Graeme Gregory <dp@xora.org.uk>" RCONFLICTS_${PN} = "mplayer-atty" |