[oe-commits] org.oe.dev merge of '474680366447a4dab2f989364e5d93df82ff5054'
hrw commit
oe at amethyst.openembedded.net
Mon Sep 1 17:52:51 UTC 2008
merge of '474680366447a4dab2f989364e5d93df82ff5054'
and 'e823514ff8e0cdded7f451b2e7602dea0a0a9fc7'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed
ViewMTN: http://monotone.openembedded.org/revision/info/b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed
Files:
1
packages/fontconfig/fontconfig-2.6.0
packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
packages/fontconfig/fontconfig-native_2.6.0.bb
packages/fontconfig/fontconfig_2.6.0.bb
packages/neuros-public/neuros-app-photoalbum_git.bb
packages/neuros-public/neuros-app-vplayer_git.bb
packages/neuros-public/neuros-lib-gui_git.bb
packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
packages/dgen/dgen-sdl_1.23.bb
packages/linux/linux-neuros_git.bb
packages/neuros-pkggen/files/package.c
packages/neuros-pkggen/neuros-pkggen-native.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/vlc/vlc-davinci_0.8.6h.bb
Diffs:
#
# mt diff -r474680366447a4dab2f989364e5d93df82ff5054 -rb7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed
#
#
#
# add_dir "packages/fontconfig/fontconfig-2.6.0"
#
# add_file "packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch"
# content [5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c]
#
# add_file "packages/fontconfig/fontconfig-native_2.6.0.bb"
# content [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# add_file "packages/fontconfig/fontconfig_2.6.0.bb"
# content [5554f91bd476e11e0bb44b471239d177ef4b0faa]
#
============================================================
--- packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
+++ packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
============================================================
--- packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
+++ packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+ oe_runmake install
+ install fc-lang/fc-lang ${STAGING_BINDIR}
+ install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
============================================================
--- packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
+++ packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
@@ -0,0 +1,76 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+ autotools_do_install
+}
+
#
# mt diff -re823514ff8e0cdded7f451b2e7602dea0a0a9fc7 -rb7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed
#
#
#
# add_file "packages/neuros-public/neuros-app-photoalbum_git.bb"
# content [416328da2e90add3a3853d718ccea008eda78656]
#
# add_file "packages/neuros-public/neuros-app-vplayer_git.bb"
# content [299d2a1a69bef11fae99e7febe2ea7a51c2b3dc2]
#
# add_file "packages/neuros-public/neuros-lib-gui_git.bb"
# content [7348c5d289f759314009104632995680329630b8]
#
# patch "packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch"
# from [f5ec6489f490fbe135c91e1d2aa9145eacbabdd6]
# to [8d8a0491ca3bb65bbcb1eba647de9f447ce859c6]
#
# patch "packages/dgen/dgen-sdl_1.23.bb"
# from [a3aecaa526b1fad198c4eeff09990398df3eafbc]
# to [5385ad78b79a29edbb73c8dccd827c3466dc7881]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [f776e221893fa16a1e86401186421973419fa57e]
# to [c0d3d98cd5c172f91ccbb86f1a5b442cdfd710d6]
#
# patch "packages/neuros-pkggen/files/package.c"
# from [5b9ae408e185322aca1c6b3fb68aa5c38ec7f44a]
# to [cf8bc159d1fc793a93448e82dcc0f69ad8d075a5]
#
# patch "packages/neuros-pkggen/neuros-pkggen-native.bb"
# from [a724aaecd6c0bae0cdcb4a47a1c834877c51045d]
# to [2fb19efa21fb1da401e283f710a450ea60527202]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [066f779d14370cd80cffd7fd784d04df7990a255]
# to [52eb100795eab3da97793d1a0c56f1d37c3cf2d0]
#
# patch "packages/neuros-public/neuros-nwm_git.bb"
# from [8066ae3bdfcaa465ac10245698627f7a5653631c]
# to [69c49f36ea0a2a061449099bf15772969f100cf4]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
# to [2e1adba40fc931ff78f3cd1d9c44960eb03eb99a]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [b6c1bda931bc3931b51360e18ec6341576756a47]
# to [52ee814151b9134b026968bc047921f383abf0a6]
#
============================================================
--- packages/neuros-public/neuros-app-photoalbum_git.bb 416328da2e90add3a3853d718ccea008eda78656
+++ packages/neuros-public/neuros-app-photoalbum_git.bb 416328da2e90add3a3853d718ccea008eda78656
@@ -0,0 +1,20 @@
+DESCRIPTION = "Neuros photoalbum app"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "2e08d843f04a98738e66507f70fe3f503c263bff"
+SRC_URI = "git://git.neurostechnology.com/git/app-photoalbum;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/photoalbum ${D}/${bindir}
+}
+
+
============================================================
--- packages/neuros-public/neuros-app-vplayer_git.bb 299d2a1a69bef11fae99e7febe2ea7a51c2b3dc2
+++ packages/neuros-public/neuros-app-vplayer_git.bb 299d2a1a69bef11fae99e7febe2ea7a51c2b3dc2
@@ -0,0 +1,20 @@
+DESCRIPTION = "Neuros videoplayer app"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "8f8347f0baf46b9c4fa89afc743c726c651ed4a1"
+SRC_URI = "git://git.neurostechnology.com/git/app-vplayer;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/vplayer ${D}/${bindir}
+}
+
+
============================================================
--- packages/neuros-public/neuros-lib-gui_git.bb 7348c5d289f759314009104632995680329630b8
+++ packages/neuros-public/neuros-lib-gui_git.bb 7348c5d289f759314009104632995680329630b8
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros lib-gui"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "bac10d263a4bb9e01db16d7dd356de315a3ffed7"
+SRC_URI = "git://git.neurostechnology.com/git/lib-gui;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+ install -d ${D}/${libdir}/
+ install -m 0755 ${S}/build/lib* ${D}/${libdir}
+}
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}
+}
============================================================
--- packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch f5ec6489f490fbe135c91e1d2aa9145eacbabdd6
+++ packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch 8d8a0491ca3bb65bbcb1eba647de9f447ce859c6
@@ -1,7 +1,8 @@
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am 2001-02-22 00:14:21 +00:00
-+++ dgen-sdl-1.23/Makefile.am 2005-02-24 23:21:05 +00:00
-@@ -5,7 +5,7 @@
+Index: dgen-sdl-1.23/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.am
++++ dgen-sdl-1.23/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.asm.am
DIST_SUBDIRS = star musa mz80 sdl
SUBDIRS = @CPUDIRS@ @INTERFACE@
@@ -10,9 +11,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
bin_PROGRAMS = dgen tobin
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am 2000-01-14 00:55:49 +00:00
-+++ dgen-sdl-1.23/Makefile.asm.am 2005-02-24 23:21:05 +00:00
+Index: dgen-sdl-1.23/Makefile.asm.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.asm.am
++++ dgen-sdl-1.23/Makefile.asm.am
@@ -1,5 +1,5 @@
# Tell how to make assembler files
-SUFFIXES += .asmu .asm
@@ -20,10 +22,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
.asm.o:
@NASM@ -f @NASM_FMT@ $<
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in 2001-07-02 19:34:18 +01:00
-+++ dgen-sdl-1.23/configure.in 2005-02-25 00:20:08 +00:00
-@@ -62,41 +62,39 @@
+Index: dgen-sdl-1.23/configure.in
+===================================================================
+--- dgen-sdl-1.23.orig/configure.in
++++ dgen-sdl-1.23/configure.in
+@@ -62,41 +62,39 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
EXTRAOBJS=
dnl Check for SDL joystick
@@ -31,20 +34,15 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
-AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL,
- dnl Check for Linux joystick as a backup
- AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX))
-+AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
-
+-
-dnl Check for X (so we can find the OpenGL headers)
-AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LIBS="$LIBS $X_LIBS"
-+#dnl Check for X (so we can find the OpenGL headers)
-+#AC_PATH_XTRA
-+#CFLAGS="$CFLAGS $X_CFLAGS"
-+#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-+#LIBS="$LIBS $X_LIBS"
++AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
- dnl Check for OpenGL support in SDL
+-dnl Check for OpenGL support in SDL
-AC_ARG_WITH(opengl,
- [ --without-opengl Don't use SDL OpenGL support],
- OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
@@ -66,8 +64,14 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
- LIBS=$oldLIBS
- CPPFLAGS=$oldCPPFLAGS
- fi
--
++#dnl Check for X (so we can find the OpenGL headers)
++#AC_PATH_XTRA
++#CFLAGS="$CFLAGS $X_CFLAGS"
++#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
++#LIBS="$LIBS $X_LIBS"
+
-fi
++dnl Check for OpenGL support in SDL
+OPENGL_SUPPORT=no
+#AC_ARG_WITH(opengl,
+# [ --without-opengl Don't use SDL OpenGL support],
@@ -95,7 +99,7 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
if test x$OPENGL_SUPPORT \!= xno; then
AC_DEFINE(SDL_OPENGL_SUPPORT)
-@@ -166,8 +164,11 @@
+@@ -166,8 +164,11 @@ changequote([,])
else
CHOP_=cat
fi
@@ -109,10 +113,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
dnl Check for MMX
AC_ARG_WITH(mmx,
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am 2000-01-29 00:46:22 +00:00
-+++ dgen-sdl-1.23/musa/Makefile.am 2005-02-25 01:10:38 +00:00
-@@ -8,7 +8,10 @@
+Index: dgen-sdl-1.23/musa/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/musa/Makefile.am
++++ dgen-sdl-1.23/musa/Makefile.am
+@@ -8,7 +8,10 @@ noinst_PROGRAMS = m68kmake
noinst_LIBRARIES = libmusa68.a
@@ -124,9 +129,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
m68kops.c: m68kmake
./m68kmake
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am 2000-10-27 00:08:19 +01:00
-+++ dgen-sdl-1.23/mz80/Makefile.am 2005-02-25 00:22:19 +00:00
+Index: dgen-sdl-1.23/mz80/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/mz80/Makefile.am
++++ dgen-sdl-1.23/mz80/Makefile.am
@@ -3,13 +3,11 @@
include $(top_srcdir)/Makefile.asm.am
@@ -145,10 +151,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
EXTRA_DIST = mz80.txt
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am 2001-02-10 19:34:28 +00:00
-+++ dgen-sdl-1.23/sdl/Makefile.am 2005-02-25 01:26:27 +00:00
-@@ -3,11 +3,14 @@
+Index: dgen-sdl-1.23/sdl/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/sdl/Makefile.am
++++ dgen-sdl-1.23/sdl/Makefile.am
+@@ -3,12 +3,15 @@
EXTRA_DIST = dgenfont.pbm chartfont.c
@@ -158,16 +165,18 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
noinst_PROGRAMS = pbm2df
noinst_LIBRARIES = libpd.a
-+
+
+pbm2df: pbm2df.c
+ $(HOSTCC) -o pbm2df pbm2df.c
-
++
# built sources
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am 2001-07-02 22:48:27 +01:00
-+++ dgen-sdl-1.23/star/Makefile.am 2005-02-24 23:21:05 +00:00
-@@ -7,7 +7,7 @@
+ BUILT_SOURCES = dgenfont.cpp
+Index: dgen-sdl-1.23/star/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/star/Makefile.am
++++ dgen-sdl-1.23/star/Makefile.am
+@@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.asm.am
# license)
EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt
@@ -176,3 +185,17 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
noinst_LIBRARIES = libstarcpu.a
+Index: dgen-sdl-1.23/musa/m68kcpu.h
+===================================================================
+--- dgen-sdl-1.23.orig/musa/m68kcpu.h
++++ dgen-sdl-1.23/musa/m68kcpu.h
+@@ -51,7 +51,8 @@
+ #define int32 long
+
+ /* int and unsigned int must be at least 32 bits wide */
+-#define uint unsigned int
++//#define uint unsigned int
++typedef unsigned int uint;
+
+
+ /* Allow for architectures that don't have 8-bit sizes */
============================================================
--- packages/dgen/dgen-sdl_1.23.bb a3aecaa526b1fad198c4eeff09990398df3eafbc
+++ packages/dgen/dgen-sdl_1.23.bb 5385ad78b79a29edbb73c8dccd827c3466dc7881
@@ -1,12 +1,14 @@
-inherit autotools
+DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
+DEPENDS = "virtual/libsdl"
+SECTION = "x11/games"
+LICENSE = "BSD"
-DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+ http://pknet.com/~joe/${PN}-${PV}.tar.gz \
+ file://fix-configure-and-make.patch;patch=1 \
+"
-SECTION = "x11/games"
-DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
-DEPENDS = "virtual/libsdl"
-SRC_URI = "http://pknet.com/~joe/${PN}-${PV}.tar.gz \
- file://fix-configure-and-make.patch;patch=1"
+inherit autotools
EXTRA_OECONF = " --disable-sdltest --without-x --without-opengl --without-nasm --without-mmx --without-star"
============================================================
--- packages/linux/linux-neuros_git.bb f776e221893fa16a1e86401186421973419fa57e
+++ packages/linux/linux-neuros_git.bb c0d3d98cd5c172f91ccbb86f1a5b442cdfd710d6
@@ -2,10 +2,10 @@ DESCRIPTION = "Linux kernel for Neuros O
DESCRIPTION = "Linux kernel for Neuros OSD devices"
-SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8"
+SRCREV = "3560f6dca0c8dd97d9e2a935f68303effb3b8cc5"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r9"
+PR = "r10"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
============================================================
--- packages/neuros-pkggen/files/package.c 5b9ae408e185322aca1c6b3fb68aa5c38ec7f44a
+++ packages/neuros-pkggen/files/package.c cf8bc159d1fc793a93448e82dcc0f69ad8d075a5
@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
}
/* packet firmware to package */
- if (pack_firmware(fp_w, hw_len, 4, &argv[3]) != 0)
+ if (pack_firmware(fp_w, hw_len, argc - 3, &argv[3]) != 0)
return(-1);
/* packet upk_desc and version info */
if (pack_ver_info(fp_w, hw_len+phd->p_headsize, argv[2]) != 0)
============================================================
--- packages/neuros-pkggen/neuros-pkggen-native.bb a724aaecd6c0bae0cdcb4a47a1c834877c51045d
+++ packages/neuros-pkggen/neuros-pkggen-native.bb 2fb19efa21fb1da401e283f710a450ea60527202
@@ -1,6 +1,6 @@ LICENSE = "GPLv2"
DESCRIPTION = "Tool to generate ready to flash .pkg files for neuros machines"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
inherit native
============================================================
--- packages/neuros-public/neuros-lib-widgets_git.bb 066f779d14370cd80cffd7fd784d04df7990a255
+++ packages/neuros-public/neuros-lib-widgets_git.bb 52eb100795eab3da97793d1a0c56f1d37c3cf2d0
@@ -2,13 +2,13 @@ PV = "0.0+${PR}+gitr${SRCREV}"
LICENSE = "GPL"
PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
DEPENDS = "qt-embedded"
inherit qtopia4core
-SRCREV = "9988829eab1428f03f5f5dba8866b2f4da267d67"
+SRCREV = "af9e7b73d0313046587cddaec5f879c78ce05d1a"
SRC_URI = "git://git.neurostechnology.com/git/lib-widgets;protocol=git"
S = "${WORKDIR}/git/"
============================================================
--- packages/neuros-public/neuros-nwm_git.bb 8066ae3bdfcaa465ac10245698627f7a5653631c
+++ packages/neuros-public/neuros-nwm_git.bb 69c49f36ea0a2a061449099bf15772969f100cf4
@@ -2,13 +2,13 @@ PV = "0.0+${PR}+gitr${SRCREV}"
LICENSE = "GPL"
PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r2"
+PR = "r4"
DEPENDS = "qt-embedded"
inherit qtopia4core
-SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRCREV = "e6c30ba6e5be217ca4bf7e98e00f87bb7241872c"
SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
S = "${WORKDIR}/git/"
@@ -19,4 +19,8 @@ do_install() {
do_install() {
install -d ${D}/${bindir}
install -m 0755 ${S}/build/nwm ${D}/${bindir}
+ install -d ${D}/${libdir}
+ ln -sf ${datadir}/fonts ${D}/${libdir}/fonts
}
+
+FILES_${PN} += "${libdir}/fonts"
============================================================
--- packages/neuros-public/neuros-qt-plugins_git.bb 8e03d1bc20bb51c31f921404d846b4c6fa902d59
+++ packages/neuros-public/neuros-qt-plugins_git.bb 2e1adba40fc931ff78f3cd1d9c44960eb03eb99a
@@ -2,13 +2,13 @@ PV = "0.0+${PR}+gitr${SRCREV}"
LICENSE = "GPL"
PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
DEPENDS = "qt-embedded"
inherit qtopia4core
-SRCREV = "6787bd510524155d783e1bce323fc5a14cf9ebd2"
+SRCREV = "d344957a0731d31cbe5ef5e1f64defbb1627d162"
SRC_URI = "git://git.neurostechnology.com/git/qt-plugins;protocol=git"
S = "${WORKDIR}/git/osdir"
============================================================
--- packages/vlc/vlc-davinci_0.8.6h.bb b6c1bda931bc3931b51360e18ec6341576756a47
+++ packages/vlc/vlc-davinci_0.8.6h.bb 52ee814151b9134b026968bc047921f383abf0a6
@@ -4,9 +4,9 @@ SECTION = "multimedia"
PRIORITY = "optional"
SECTION = "multimedia"
-SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589"
+SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c"
-PR = "r4"
+PR = "r5"
PV = "0.8.6h+${PR}+gitr${SRCREV}"
More information about the Openembedded-commits
mailing list