diff options
Diffstat (limited to 'recipes')
26 files changed, 233 insertions, 11 deletions
diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc index 461315649b..4dad51e4db 100644 --- a/recipes/gnome/libart-lgpl.inc +++ b/recipes/gnome/libart-lgpl.inc @@ -4,6 +4,8 @@ LICENSE = "LGPL" ART_CONFIG = "${HOST_ARCH}/art_config.h" +INC_PR = "r4" + # can't use gnome.oeclass due to _ in filename SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ file://${ART_CONFIG} \ @@ -27,7 +29,6 @@ EXTRA_OECONF = "--disable-gtk-doc" # enforced. export MKDIR_P = "mkdir -p" export mkdir_p = "mkdir -p" -export INSTALL = "${STAGING_BINDIR_NATIVE}/install-sh" do_stage() { autotools_stage_includes diff --git a/recipes/gnome/libart-lgpl_2.3.16.bb b/recipes/gnome/libart-lgpl_2.3.16.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.16.bb +++ b/recipes/gnome/libart-lgpl_2.3.16.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gnome/libart-lgpl_2.3.19.bb b/recipes/gnome/libart-lgpl_2.3.19.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.19.bb +++ b/recipes/gnome/libart-lgpl_2.3.19.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gpe-announce/files/fix-install.diff b/recipes/gpe-announce/files/fix-install.diff new file mode 100644 index 0000000000..3827f5562a --- /dev/null +++ b/recipes/gpe-announce/files/fix-install.diff @@ -0,0 +1,13 @@ +diff --git gpe-announce-0.13/Makefile-orig gpe-announce-0.13/Makefile +index 56e016a..f8bade4 100644 +--- gpe-announce-0.13/Makefile-orig ++++ gpe-announce-0.13/Makefile +@@ -47,7 +47,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/gpe-announce/gpe-announce_0.13.bb b/recipes/gpe-announce/gpe-announce_0.13.bb index 6ffe317a12..21538c43a7 100644 --- a/recipes/gpe-announce/gpe-announce_0.13.bb +++ b/recipes/gpe-announce/gpe-announce_0.13.bb @@ -4,4 +4,7 @@ DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" LICENSE = "GPL" PR = "r1" -SRC_URI += "file://fix-esound.diff;patch=1" +SRC_URI += " \ + file://fix-esound.diff;patch=1 \ + file://fix-install.diff;patch=1 \ + " diff --git a/recipes/gpe-announce/gpe-announce_0.14.bb b/recipes/gpe-announce/gpe-announce_0.14.bb new file mode 100644 index 0000000000..9fb7e95daf --- /dev/null +++ b/recipes/gpe-announce/gpe-announce_0.14.bb @@ -0,0 +1,7 @@ +inherit gpe + +DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" +LICENSE = "GPL" +PR = "r0" + +SRC_URI += "file://fix-esound.diff;patch=1" diff --git a/recipes/gpe-clock/files/fix-install.patch b/recipes/gpe-clock/files/fix-install.patch new file mode 100644 index 0000000000..2d3e3032d0 --- /dev/null +++ b/recipes/gpe-clock/files/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-clock-0.25/Makefile-orig gpe-clock-0.25/Makefile +index 4fa59bf..e716fcb 100644 +--- gpe-clock-0.25/Makefile-orig ++++ gpe-clock-0.25/Makefile +@@ -36,7 +36,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ + install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-clock/gpe-clock.inc b/recipes/gpe-clock/gpe-clock.inc index d4ae3da39c..b36fa7dafa 100644 --- a/recipes/gpe-clock/gpe-clock.inc +++ b/recipes/gpe-clock/gpe-clock.inc @@ -6,3 +6,5 @@ DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" RDEPENDS = "gpe-announce" inherit gpe + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.27.bb b/recipes/gpe-clock/gpe-clock_0.27.bb new file mode 100644 index 0000000000..de509fda40 --- /dev/null +++ b/recipes/gpe-clock/gpe-clock_0.27.bb @@ -0,0 +1 @@ +require gpe-clock.inc diff --git a/recipes/gpe-plucker/gpe-plucker/fix-install.patch b/recipes/gpe-plucker/gpe-plucker/fix-install.patch new file mode 100644 index 0000000000..cfd5bc477a --- /dev/null +++ b/recipes/gpe-plucker/gpe-plucker/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-plucker-0.4/Makefile-orig gpe-plucker-0.4/Makefile +index c68b5ab..abf97bb 100644 +--- gpe-plucker-0.4/Makefile-orig ++++ gpe-plucker-0.4/Makefile +@@ -43,7 +43,7 @@ $(PACKAGE): $(OBJS) $(LIB) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + #mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-plucker/gpe-plucker_0.4.bb b/recipes/gpe-plucker/gpe-plucker_0.4.bb index 8e90d2f06b..4a2937a83b 100644 --- a/recipes/gpe-plucker/gpe-plucker_0.4.bb +++ b/recipes/gpe-plucker/gpe-plucker_0.4.bb @@ -5,10 +5,13 @@ DEPENDS = "gtk+ libgpewidget gpe-icons" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" +PR = "r3" + +SRC_URI += " \ + file://plucker-no-host-includes.patch;patch=1 \ + file://fix-install.patch;patch=1 \ + " -SRC_URI += " file://plucker-no-host-includes.patch;patch=1" PARALLEL_MAKE="" EXTRA_OEMAKE="RANLIB=${RANLIB}" -PR = "r2" - diff --git a/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch b/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch new file mode 100644 index 0000000000..2e32aa5ee9 --- /dev/null +++ b/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-tetris-0.6-4/Makefile-orig gpe-tetris-0.6-4/Makefile +index 82c7245..27de49f 100644 +--- gpe-tetris-0.6-4/Makefile-orig ++++ gpe-tetris-0.6-4/Makefile +@@ -46,7 +46,7 @@ install-program: all + install -m 644 pixmaps/stop.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/stop.png + install -m 644 pixmaps/pause.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/pause.png + install -m 644 pixmaps/highscores.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/highscores.png +- install -s $(PACKAGE) $(BIN_PATH)/$(PACKAGE) ++ install $(PACKAGE) $(BIN_PATH)/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/applications + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 gpe-tetris.desktop $(DESTDIR)$(PREFIX)/share/applications/ diff --git a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb index 4a13d2443f..aa33b1fa6c 100644 --- a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb +++ b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb @@ -1,9 +1,11 @@ LICENSE = "GPL" inherit gpe +PR = "r1" + DESCRIPTION = "GTK+2 port of the well known game, Tetris." DEPENDS = "gtk+ libgpewidget gpe-icons" SECTION = "gpe" PRIORITY = "optional" - +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch b/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch new file mode 100644 index 0000000000..3ae63a839f --- /dev/null +++ b/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch @@ -0,0 +1,13 @@ +diff --git gpe-watch-0.10/Makefile-orig gpe-watch-0.10/Makefile +index 2f74616..58fa802 100644 +--- gpe-watch-0.10/Makefile-orig ++++ gpe-watch-0.10/Makefile +@@ -39,7 +39,7 @@ $(PACKAGE): $(OBJS) $(LIB) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + #mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-watch/gpe-watch_0.10.bb b/recipes/gpe-watch/gpe-watch_0.10.bb index e0d514701c..9b386a2755 100644 --- a/recipes/gpe-watch/gpe-watch_0.10.bb +++ b/recipes/gpe-watch/gpe-watch_0.10.bb @@ -1,5 +1,6 @@ LICENSE = "GPL" inherit gpe pkgconfig +PR = "r1" DESCRIPTION = "GPE analog clock-watch" DEPENDS = "gtk+ libgpewidget" @@ -7,4 +8,6 @@ SECTION = "gpe" PRIORITY = "optional" SRC_URI += "file://fix_makefile.patch;patch=1 \ - file://no-render-h.patch;patch=1" + file://fix_install.patch;patch=1 \ + file://no-render-h.patch;patch=1 \ + " diff --git a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch index 78506a8319..f734be4961 100644 --- a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch +++ b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch @@ -27,3 +27,16 @@ diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Mak clean: rm -f *.o +Index: Makefile +=================================================================== +--- a/Makefile (Revision 9905) ++++ b/Makefile (Arbeitskopie) +@@ -29,7 +29,7 @@ + + install-program: gsoko gsoko.desktop + install -d $(DESTDIR)$(PREFIX)/bin +- install -s gsoko $(DESTDIR)$(PREFIX)/bin/gsoko ++ install gsoko $(DESTDIR)$(PREFIX)/bin/gsoko + install -d $(DESTDIR)$(PREFIX)/share/gsoko/img + install -d $(DESTDIR)$(PREFIX)/share/gsoko/levels + for i in $(LEVELS); do install -m 644 levels/$$i.lev $(DESTDIR)$(PREFIX)/share/gsoko/levels/$$i.lev; done diff --git a/recipes/gsoko/gsoko_0.4.2-gpe6.bb b/recipes/gsoko/gsoko_0.4.2-gpe6.bb index 0d12a6fd06..6a34be2bc4 100644 --- a/recipes/gsoko/gsoko_0.4.2-gpe6.bb +++ b/recipes/gsoko/gsoko_0.4.2-gpe6.bb @@ -4,5 +4,6 @@ DEPENDS = "gtk+ libgpewidget" SECTION = "gpe" DESCRIPTION = "Sokoban game for GTK" PRIORITY = "optional" +PR = "r1" SRC_URI += "file://fix_makefiles.patch;patch=1" diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb index eb6cc536b9..0289e2ed22 100644 --- a/recipes/gtk+/gtk+_2.14.2.bb +++ b/recipes/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r4" +PR = "r5" DEPENDS += "cairo jasper" @@ -39,6 +39,16 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } + +do_stage_append() { + + # this tool is required by gnome-keyring 2.26.0 to get built + # it is written in Python and use only Python xml + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} + +} + # gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" diff --git a/recipes/llvm/llvm2.6-native_2.5+svnr20090504.bb b/recipes/llvm/llvm2.6-native_2.5+svnr20090504.bb new file mode 100644 index 0000000000..86397c9920 --- /dev/null +++ b/recipes/llvm/llvm2.6-native_2.5+svnr20090504.bb @@ -0,0 +1,18 @@ +require llvm-native.inc + +SRCREV = "70854" + +PV = "2.5+svnr${SRCREV}" + +PR = "r0" + +SRC_URI = "\ + svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ + file://fix-build.patch;patch=1 \ + file://llvm-enable-threads-macro.patch;patch=1;pnum=0 \ + file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \ +" + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.6" diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch new file mode 100644 index 0000000000..553965608a --- /dev/null +++ b/recipes/llvm/llvm2.6/fix-build.patch @@ -0,0 +1,13 @@ +Index: tools/llvm-config/CMakeLists.txt +=================================================================== +--- a/tools.orig/llvm-config/CMakeLists.txt 2009-04-09 10:45:01.000000000 +0200 ++++ b/tools/llvm-config/CMakeLists.txt 2009-04-09 10:43:52.000000000 +0200 +@@ -90,7 +90,7 @@ + add_custom_command(OUTPUT ${LLVM_CONFIG} + COMMAND echo 's!@LLVM_CPPFLAGS@!${CPP_FLGS}!' > temp.sed + COMMAND echo 's!@LLVM_CFLAGS@!${C_FLGS}!' >> temp.sed +- COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS}!' >> temp.sed ++ COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden!' >> temp.sed + # TODO: Use general flags for linking! not just for shared libs: + COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed + COMMAND echo 's!@LIBS@!!' >> temp.sed # TODO: System libs diff --git a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch new file mode 100644 index 0000000000..8888884ea5 --- /dev/null +++ b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch @@ -0,0 +1,13 @@ +Index: lib/Support/Debug.cpp +=================================================================== +--- lib/Support/Debug.cpp (Revision 71077) ++++ lib/Support/Debug.cpp (Arbeitskopie) +@@ -48,7 +48,7 @@ + static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> > + DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"), + cl::Hidden, cl::value_desc("debug string"), +- cl::location(DebugOnlyOptLoc), cl::ValueRequired); ++ cl::location(DebugOnlyOptLoc), cl::ValueRequired, cl::ZeroOrMore); + #endif + } + diff --git a/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch b/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch new file mode 100644 index 0000000000..f1072d9af9 --- /dev/null +++ b/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch @@ -0,0 +1,29 @@ +Index: trunk/include/llvm/Config/config.h.cmake +=================================================================== +--- trunk.orig/include/llvm/Config/config.h.cmake 2009-05-06 16:39:19.957841609 +0200 ++++ trunk/include/llvm/Config/config.h.cmake 2009-05-06 16:39:20.185842055 +0200 +@@ -194,7 +194,7 @@ + #cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI} + + /* Define to 1 if you have the `pthread' library (-lpthread). */ +-#undef HAVE_LIBPTHREAD ++#cmakedefine HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD} + + /* Define to 1 if you have the `udis86' library (-ludis86). */ + #undef HAVE_LIBUDIS86 +Index: trunk/cmake/config-ix.cmake +=================================================================== +--- trunk.orig/cmake/config-ix.cmake 2009-05-06 16:49:45.121841057 +0200 ++++ trunk/cmake/config-ix.cmake 2009-05-06 16:50:25.738552620 +0200 +@@ -98,6 +98,11 @@ + if( HAVE_PTHREAD_H OR WIN32 ) + set(ENABLE_THREADS 1) + endif() ++ ++# FIXME: Actually check for the library ++ if( HAVE_PTHREAD_H ) ++ set(HAVE_LIBPTHREAD 1) ++ endif() + endif() + + if( ENABLE_THREADS ) diff --git a/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch b/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch new file mode 100644 index 0000000000..6f17b850f6 --- /dev/null +++ b/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch @@ -0,0 +1,14 @@ +Index: include/llvm/Config/config.h.cmake +=================================================================== +--- include/llvm/Config/config.h.cmake (Revision 71077) ++++ include/llvm/Config/config.h.cmake (Arbeitskopie) +@@ -276,6 +276,9 @@ + /* Define to have the %a format string */ + #undef HAVE_PRINTF_A + ++/* Have pthread.h */ ++#cmakedefine HAVE_PTHREAD_H ${HAVE_PTHREAD_H} ++ + /* Have pthread_mutex_lock */ + #cmakedefine HAVE_PTHREAD_MUTEX_LOCK ${HAVE_PTHREAD_MUTEX_LOCK} + diff --git a/recipes/llvm/llvm2.6_2.5+svnr20090504.bb b/recipes/llvm/llvm2.6_2.5+svnr20090504.bb new file mode 100644 index 0000000000..9ba13ceadc --- /dev/null +++ b/recipes/llvm/llvm2.6_2.5+svnr20090504.bb @@ -0,0 +1,21 @@ +require llvm.inc + +SRCREV = "70854" + +PV = "2.5+svnr${SRCREV}" + +PR = "r0" + +DEPENDS = "llvm-common llvm2.6-native" + +SRC_URI = "\ + svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ + file://fix-build.patch;patch=1 \ + file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \ + file://llvm-fix-pthreads_h.patch;patch=1;pnum=0 \ + file://llvm-fix-have_libpthread.patch;patch=1 \ +" + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.6" diff --git a/recipes/xdemineur/xdemineur-2.1.1/Makefile b/recipes/xdemineur/xdemineur-2.1.1/Makefile index 10d34b2477..218df56d6f 100644 --- a/recipes/xdemineur/xdemineur-2.1.1/Makefile +++ b/recipes/xdemineur/xdemineur-2.1.1/Makefile @@ -22,7 +22,7 @@ xdemineur: $(OBJS) install: all install -d $(DESTDIR)$(PREFIX)/bin - install -s xdemineur $(DESTDIR)$(PREFIX)/bin/xdemineur + install xdemineur $(DESTDIR)$(PREFIX)/bin/xdemineur install -D -m 644 xdemineur.xpm $(DESTDIR)$(PREFIX)/share/pixmaps/xdemineur.xpm install -D -m 644 familiar/xdemineur.png $(DESTDIR)$(PREFIX)/share/pixmaps/xdemineur.png install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/xdemineur/xdemineur_2.1.1.bb b/recipes/xdemineur/xdemineur_2.1.1.bb index 73e3276aac..23846dfd44 100644 --- a/recipes/xdemineur/xdemineur_2.1.1.bb +++ b/recipes/xdemineur/xdemineur_2.1.1.bb @@ -1,5 +1,6 @@ inherit gpe LICENSE = "BSD-X" +PR = "r1" DEPENDS = "virtual/libx11 libxpm" SECTION = "gpe/games" |