diff options
| author | Phil Blundell <philb@gnu.org> | 2005-04-19 13:57:26 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2005-04-19 13:57:26 +0000 |
| commit | b4afe3888612bf2b18712a32e00512230fb7c533 (patch) | |
| tree | 6ba6d104c2916a3a6736e66e5708cdad77a2ca20 /packages/mplayer | |
| parent | 6778414ad9576f9c73578619a5626ba4ace23a55 (diff) | |
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mebius.reciva.com:/home/pb/oe/oe
2005/04/19 14:34:50+01:00 (none)!XorA
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded
2005/04/19 14:33:43+01:00 (none)!XorA
Import the changes from mplayer for compile problems into mplayer-atty
2005/04/19 15:31:37+02:00 utwente.nl!koen
pivotboot-image.bb:
fix feed locations
BKrev: 42650e46qaSLeGzMeVn_kfodIpKH0w
Diffstat (limited to 'packages/mplayer')
4 files changed, 15 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch index e69de29bb2..11f2d6a0b7 100644 --- a/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch +++ b/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch @@ -0,0 +1,11 @@ +--- mplayer-1.0.1/Makefile.orig 2005-04-07 13:05:21.381660024 +0100 ++++ mplayer-1.0.1/Makefile 2005-04-07 13:05:49.957315864 +0100 +@@ -250,7 +250,7 @@ + ifeq ($(TARGET_WIN32),yes) + windres -o osdep/mplayer-rc.o osdep/mplayer.rc + endif +- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) ++ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -lm -ljpeg -lpng $(LDFLAGS) + + mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a + winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ diff --git a/packages/mplayer/mplayer-atty-1.0.1/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.0.1/libmpcodecs-ogg-include.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.0.1/libmpcodecs-ogg-include.patch diff --git a/packages/mplayer/mplayer-atty-1.0.1/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.0.1/libmpdemux-ogg-include.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.0.1/libmpdemux-ogg-include.patch diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb index 68996bd68d..6d5796aa9e 100644 --- a/packages/mplayer/mplayer-atty_1.0.1.bb +++ b/packages/mplayer/mplayer-atty_1.0.1.bb @@ -8,12 +8,14 @@ SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ file://sdl.patch;patch=1 \ file://Makefile-libs.patch;patch=1 \ - file://dsputil.patch;patch=1" + file://dsputil.patch;patch=1 \ + file://libmpdemux-ogg-include.patch;patch=1 \ + file://libmpcodecs-ogg-include.patch;patch=1 " RCONFLICTS="mplayer" MAINTAINER="Graeme Gregory <dp@xora.org.uk>" -PR = "r2" +PR = "r3" PARALLEL_MAKE = "" |