summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-05-11 13:42:35 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-05-11 13:42:35 +0000
commit34c2008f8cf3e80f979f5e77584b1cd97dd041af (patch)
treefd1566b4fea522d27d2d12da92fc4e57e61d2c17
parentf8a5baa72454d255ee67607e70eccded45c451c9 (diff)
This changes makes libsdl-qpe work with python-pygame. Patch courtesy mithro
BKrev: 40a0d84b_NxrNea2FT93LpGWX2S1Yg
-rw-r--r--libsdl/libsdl-qpe-1.2.7/pygame.patch0
-rw-r--r--libsdl/libsdl-qpe_1.2.7.oe1
-rw-r--r--python/python-pygame-1.6/qpe.patch0
-rw-r--r--python/python-pygame_1.6.oe3
-rw-r--r--uicmoc/uicmoc3-native_3.3.1.oe30
5 files changed, 3 insertions, 31 deletions
diff --git a/libsdl/libsdl-qpe-1.2.7/pygame.patch b/libsdl/libsdl-qpe-1.2.7/pygame.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libsdl/libsdl-qpe-1.2.7/pygame.patch
diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe
index baf130fd0f..14957e02b6 100644
--- a/libsdl/libsdl-qpe_1.2.7.oe
+++ b/libsdl/libsdl-qpe_1.2.7.oe
@@ -7,6 +7,7 @@ PROVIDES = "virtual/libsdl"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://${FILESDIR}/agawa-piro-mickey.patch;patch=1 \
+ file://${FILESDIR}/pygame.patch;patch=1 \
file://${FILESDIR}/gcc34.patch;patch=1"
S = "${WORKDIR}/SDL-${PV}"
diff --git a/python/python-pygame-1.6/qpe.patch b/python/python-pygame-1.6/qpe.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/python/python-pygame-1.6/qpe.patch
diff --git a/python/python-pygame_1.6.oe b/python/python-pygame_1.6.oe
index 90c7d5c9a6..dd2dd42431 100644
--- a/python/python-pygame_1.6.oe
+++ b/python/python-pygame_1.6.oe
@@ -6,7 +6,8 @@ RDEPENDS = "python-core python-numeric"
DEPENDS = "virtual/libc virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
SRCNAME = "pygame"
-SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz \
+ file://${FILESDIR}/qpe.patch;patch=1"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
diff --git a/uicmoc/uicmoc3-native_3.3.1.oe b/uicmoc/uicmoc3-native_3.3.1.oe
deleted file mode 100644
index a41fb7fe1e..0000000000
--- a/uicmoc/uicmoc3-native_3.3.1.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-inherit native
-
-DEPENDS = "x11-native"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.1.tar.bz2"
-S = "${WORKDIR}/qt-x11-free-${PV}"
-
-export QTDIR = "${S}"
-#export SYSCONF_CXX = "${CCACHE} g++"
-#export SYSCONF_CC = "${CCACHE} gcc"
-#export SYSCONF_LINK = "${CCACHE} g++"
-
-ARCH_i686 = "x86"
-
-QT_CONFIG_FLAGS = "-release -static -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
- -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-thread -no-nis -no-cups"
-
-do_configure() {
- echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS}
-}
-
-do_stage() {
- install -m 0755 bin/moc ${STAGING_BINDIR}/moc3
- install -m 0755 bin/uic ${STAGING_BINDIR}/uic3
- oe_libinstall -a -C lib libqt ${STAGING_LIBDIR}
- for f in include/*.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/
- done
-}