[oe-commits] org.oe.dev uqm: Fix 0.5.0 build assumptions with a patch, fix staging references

[rpurdie commit]

uqm: Fix 0.5.0 build assumptions with a patch, fix staging references

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 30b674cf4c36edad303d41edce8735cc617835da
ViewMTN: http://monotone.openembedded.org/revision/info/30b674cf4c36edad303d41edce8735cc617835da
Files:
1
packages/uqm/uqm-0.5.0
packages/uqm/uqm-0.5.0/build-oe.patch
packages/uqm/uqm_0.3.bb
packages/uqm/uqm_0.5.0.bb
Diffs:

#
# mt diff -r36b72e8f33f6dd01bcc6879e4a6b708d51e40aef -r30b674cf4c36edad303d41edce8735cc617835da
#
# 
# 
# add_dir "packages/uqm/uqm-0.5.0"
# 
# add_file "packages/uqm/uqm-0.5.0/build-oe.patch"
#  content [82d8e418676eae552e4a23d6ea6814cdacf8a23c]
# 
# patch "packages/uqm/uqm_0.3.bb"
#  from [390eb5201ea556005a015d7c87f818c9699ad432]
#    to [e738c13e85e08e12edb4e687a8d6b4e5c849f72b]
# 
# patch "packages/uqm/uqm_0.5.0.bb"
#  from [e33f178097579a1b72de5116c1da9676c88956a2]
#    to [f553e0c8857bd55564956afefb36e8f0b971c6a6]
# 
============================================================
--- packages/uqm/uqm-0.5.0/build-oe.patch	82d8e418676eae552e4a23d6ea6814cdacf8a23c
+++ packages/uqm/uqm-0.5.0/build-oe.patch	82d8e418676eae552e4a23d6ea6814cdacf8a23c
@@ -0,0 +1,40 @@
+Index: build/unix/config_proginfo_build
+===================================================================
+--- build/unix/config_proginfo_build.orig	2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_build	2008-02-28 10:01:38.000000000 +0000
+@@ -37,9 +37,9 @@
+ 
+ ### gcc ###
+ PROG_gcc_NAME="GNU C compiler"
+-PROG_gcc_FILE="gcc"
++PROG_gcc_FILE="$CC"
+ PROG_gcc_ACTION=""
+-PROG_gcc_VERSION='$(gcc --version)'
++PROG_gcc_VERSION='$($CC --version)'
+ 
+ 
+ ### sed ###
+Index: build/unix/config_proginfo_host
+===================================================================
+--- build/unix/config_proginfo_host.orig	2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_host	2008-02-28 10:03:09.000000000 +0000
+@@ -69,7 +69,7 @@
+ 		;;
+ 	*)
+ 		LIB_SDL_CFLAGS='$(sdl-config --cflags)'
+-		LIB_SDL_LDFLAGS='$(sdl-config --libs)'
++		LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz'
+ 		LIB_SDL_VERSION='$(sdl-config --version)'
+ 		;;
+ esac
+@@ -170,8 +170,8 @@
+ 		LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
+ 		;;
+ 	*)
+-		LIB_vorbisfile_CFLAGS=""
+-		LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis"
++		LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR"
++		LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg"
+ 		;;
+ esac
+ LIB_vorbisfile_VERSION=""
============================================================
--- packages/uqm/uqm_0.3.bb	390eb5201ea556005a015d7c87f818c9699ad432
+++ packages/uqm/uqm_0.3.bb	e738c13e85e08e12edb4e687a8d6b4e5c849f72b
@@ -16,7 +16,7 @@ do_configure() {
 
 do_configure() {
 	install ${WORKDIR}/build-opts.sh ${S}/
-	./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+	./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR}
 }
 
 do_compile() {
============================================================
--- packages/uqm/uqm_0.5.0.bb	e33f178097579a1b72de5116c1da9676c88956a2
+++ packages/uqm/uqm_0.5.0.bb	f553e0c8857bd55564956afefb36e8f0b971c6a6
@@ -6,17 +6,18 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-PR = "r0"
+PR = "r2"
 
 S = "${WORKDIR}/uqm-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \
            file://build-opts.sh \
+           file://build-oe.patch;patch=1;pnum=0 \
 "
 
 do_configure() {
 	install ${WORKDIR}/build-opts.sh ${S}/
-	./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+	./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR}
 }
 
 do_compile() {