summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 12:39:41 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 12:39:41 +0000
commitc06232687afe6388a9f211a1b7aebdeeb886ccf1 (patch)
treec7a46089191d57e436bd14ff757aaef323d44ef3
parentf80a95d2b6cf850caa9c51128a3be4ab213e154a (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/16 14:25:40+02:00 handhelds.org!zecke libsdl-sqp: Change the ipaq.patch to be applyable. I thought times of manually invoking diff on two directories are over... 2005/05/16 14:13:03+02:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/05/16 14:12:10+02:00 handhelds.org!zecke Opie Media Players: Add two new meta packages for special tasks (playing divx, playing ogg+mp3) Add these two packages to the task-opie-multimedia in meta-opie.bb BKrev: 4288948djW3jSJWNnlsjLoz26jOrXw
-rw-r--r--packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch21
-rw-r--r--packages/meta/meta-opie.bb2
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb0
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb0
4 files changed, 14 insertions, 9 deletions
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
index 1c4245db76..bf57953c08 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
@@ -1,15 +1,17 @@
-diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am
---- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-13 22:34:49.000000000 -0200
-+++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-13 22:36:41.000000000 -0200
+Index: SDL-1.2.7/src/video/qtopia/Makefile.am
+===================================================================
+--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-05-16 14:21:01.000000000 +0200
++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-16 14:24:02.000000000 +0200
@@ -22,4 +22,4 @@
# overwrite USER variables
CXXLD = $(CC)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@
-diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
---- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-13 22:34:49.000000000 -0200
-+++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-13 22:36:41.000000000 -0200
+Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
+===================================================================
+--- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:21:01.000000000 +0200
++++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:24:02.000000000 +0200
@@ -29,8 +29,11 @@
#include "SDL_QWin.h"
#include <qapplication.h>
@@ -72,9 +74,10 @@ diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.
default:
scancode = SDLK_UNKNOWN;
break;
-diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
---- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-13 22:34:49.000000000 -0200
-+++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-13 22:42:03.000000000 -0200
+Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
+===================================================================
+--- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:21:00.000000000 +0200
++++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:24:02.000000000 +0200
@@ -45,6 +45,7 @@
#include <qapplication.h>
#include <qpe/qpeapplication.h>
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 81402c225f..8f5e0c4422 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -266,11 +266,13 @@ opie-mediaplayer1-libmadplugin \
opie-mediaplayer1-libmodplugin \
opie-mediaplayer1-libtremorplugin \
opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-ogg-mp3 \
opie-mediaplayer2 \
opie-mediaplayer2-skin-default \
opie-mediaplayer2-skin-default-landscape \
opie-mediaplayer2-skin-pod \
opie-mediaplayer2-skin-techno \
+opie-mediaplayer2-divx \
opie-powerchord \
opie-recorder \
opie-tonleiter \
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb