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

diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb
index e69de29..a155690 100644 (file)
--- a/packages/meta/pivotboot-image.bb
+++ b/packages/meta/pivotboot-image.bb
@@ -0,0 +1,17 @@
+export IMAGE_BASENAME = "pivotboot-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "task-pivotboot"
+
+DEPENDS = "task-pivotboot"
+
+inherit image_ipk
+
+FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
+                                gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe \
+                               opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie \
+                                  e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
+
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \
+                               opie##http://familiar.handhelds.org/releases/0.8/feed/opie \
+
+LICENSE = MIT

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 e69de29..11f2d6a 100644 (file)
--- 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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb
index 68996bd..6d5796a 100644 (file)
--- 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 = ""