pandora-pmenu: Bump SRCREV and rework Makefile hacks.

diff --git a/recipes/pandora-system/pandora-pmenu.bb b/recipes/pandora-system/pandora-pmenu.bb
index 7b5ed95..5375446 100644 (file)
--- a/recipes/pandora-system/pandora-pmenu.bb
+++ b/recipes/pandora-system/pandora-pmenu.bb
@@ -3,16 +3,16 @@ LICENSE = "GPL"
 
 DEPENDS = "virtual/libsdl libgles-omap3 libgles2d pandora-libpnd libconfig"
 
 
 DEPENDS = "virtual/libsdl libgles-omap3 libgles2d pandora-libpnd libconfig"
 

-PR = "r8"
+PR = "r11"

 
 PARALLEL_MAKE = ""
 
 SRC_URI = " \
   git://github.com/Cpasjuste/pmenu.git;protocol=git;branch=master \
 
 PARALLEL_MAKE = ""
 
 SRC_URI = " \
   git://github.com/Cpasjuste/pmenu.git;protocol=git;branch=master \

-  file://remove-libconfig-from-makefile.patch;patch=1 \
+  file://0001-Remove-libconfig-from-Makefile.patch;patch=1 \

 "
 
 "
 

-SRCREV = "025802f4bfda82c75ed67ad1c91e7c4ef0517d84"
+SRCREV = "ba590077b168f25b3d18e31c5efc644846ff53ee"

 
 S = "${WORKDIR}/git"
 
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes/pandora-system/pandora-pmenu/0001-Remove-libconfig-from-Makefile.patch b/recipes/pandora-system/pandora-pmenu/0001-Remove-libconfig-from-Makefile.patch
new file mode 100644 (file)
index 0000000..da0582e
--- /dev/null
+++ b/recipes/pandora-system/pandora-pmenu/0001-Remove-libconfig-from-Makefile.patch
@@ -0,0 +1,40 @@
+From c1ebe9a959ce72f42da36930f5959a52ecff3b15 Mon Sep 17 00:00:00 2001
+From: David-John Willis <John.Willis@Distant-earth.com>
+Date: Fri, 5 Mar 2010 12:32:18 +0000
+Subject: [PATCH] Remove libconfig from Makefile.
+
+---
+ Makefile |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5e52865..d618140 100755
+--- a/Makefile
++++ b/Makefile
+@@ -11,11 +11,11 @@ STRIP = ${CROSSCOMPILE}strip
+ RM = rm
+ 
+ # environment
+-LDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D \
++EXTRALDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D \
+               -lGLES_CM -lIMGegl -lsrv_um -lXau -lXdmcp -lXi -lXext -lX11 \
+-              -lpnd -lconfig -lts-1.0 -lstdc++
++              -lpnd -lconfig -lstdc++
+ 
+-CFLAGS = -Wall -Werror -g -Ilibpnd -I$(PNDSDK)/usr/include
++CFLAGS += -Wall -Werror -g -I$(PNDSDK)/usr/include
+ CFLAGS += -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp \
+               -mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer \
+               -fno-strict-aliasing -fsingle-precision-constant
+@@ -41,7 +41,7 @@ clean:
+ #
+ 
+ pmenu:        ${ALLOBJ}
+-      ${CC} ${ALLOBJ} ${LDFLAGS} -o ${TARGET}
++      ${CC} ${ALLOBJ} ${EXTRALDFLAGS} -o ${TARGET}
+       ${STRIP} ${TARGET}
+ 
+ # deployment and assembly components
+-- 
+1.6.3.1
+

diff --git a/recipes/pandora-system/pandora-pmenu/remove-libconfig-from-makefile.patch b/recipes/pandora-system/pandora-pmenu/remove-libconfig-from-makefile.patch
deleted file mode 100644 (file)
index 03a3a21..0000000
--- a/recipes/pandora-system/pandora-pmenu/remove-libconfig-from-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile  2009-12-07 10:01:27.091137735 +0000
-+++ git/Makefile       2009-12-07 10:02:52.995649783 +0000
-@@ -11,18 +11,18 @@
- RM = rm
- 
- # environment
--LDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D \
-+EXTRALDFLAGS = -L$(PNDSDK)/usr/lib -lSDL -lSDL_image -lSDL_ttf -lfreetype -lGLES2D -lconfig \
-               -lGLES_CM -lIMGegl -lsrv_um -lXau -lXdmcp -lXi -lXext -lX11 \
-               -lpnd -lstdc++
- 
--CFLAGS = -Wall -Werror -g -Ilibconfig -Ilibpnd -I$(PNDSDK)/usr/include
-+CFLAGS += -Wall -Werror -g -I$(PNDSDK)/usr/include
- CFLAGS += -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp \
-               -mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer \
-               -fno-strict-aliasing -fsingle-precision-constant
- 
- # code
- TARGET = pmenu
--LIBCONFIG = libconfig/.libs/libconfig.a
-+
- ALLOBJ = category_media.o category_settings.o config_favourite.o \
-       config_pmenu.o config_skin.o get_apps.o main.o utils.o \
-       utils_cpu.o utils_mplayer.o
-@@ -38,21 +38,13 @@
-       cd libconfig; make distclean; cd ..;
-       find . -name "*~*" -exec rm {} \; -print
- 
--
- # component targets
- #
- 
--pmenu:        ${LIBCONFIG} ${ALLOBJ}
--      ${CC} ${ALLOBJ} ${LIBCONFIG} ${LDFLAGS} -o ${TARGET}
-+pmenu:        ${ALLOBJ}
-+      ${CC} ${ALLOBJ} ${EXTRALDFLAGS} -o ${TARGET}
-       ${STRIP} ${TARGET}
- 
--libconfig/.libs/libconfig.a:
--      cd libconfig; make distclean; \
--      LDFLAGS="-L$PNDSDK/usr/lib" CFLAGS="-I$PNDSDK/usr/include" \
--              ./configure --host=arm-none-linux-gnueabi --target=arm-none-linux-gnueabi; \
--      make libconfig.la; \
--      cd ..;
--
- # deployment and assembly components
- #
-