[oe-commits] org.oe.dev merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
oe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:19:33 UTC 2008
merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
and 'df88361619c93df2c6573ec7b6bdf56f0e4cda94'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 9f68e99b72ccd68939ca1cab014d1e79dd390bc4
ViewMTN: http://monotone.openembedded.org/revision/info/9f68e99b72ccd68939ca1cab014d1e79dd390bc4
Files:
1
packages/icon-slicer
packages/sugar/sugar-artwork
packages/icon-slicer/icon-slicer-native_0.3.bb
packages/sugar/sugar-artwork/icon-slicer.diff
packages/sugar/sugar-artwork_0.82.0.bb
packages/directfb/directfb_1.1.1.bb
packages/directfb/directfb_1.2.3.bb
packages/directfb/directfb-1.2.3
packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch
packages/directfb/directfb.inc
Diffs:
#
# mt diff -r0c72fca9e0c0a27bd39068df21078215a4362b1c -r9f68e99b72ccd68939ca1cab014d1e79dd390bc4
#
#
#
# add_dir "packages/icon-slicer"
#
# add_dir "packages/sugar/sugar-artwork"
#
# add_file "packages/icon-slicer/icon-slicer-native_0.3.bb"
# content [dffa35430308bd5c246351ccb7fe76038291031f]
#
# add_file "packages/sugar/sugar-artwork/icon-slicer.diff"
# content [7e8497cffecae70ae9e041d83ad331daa3691033]
#
# add_file "packages/sugar/sugar-artwork_0.82.0.bb"
# content [7b7f1a41f826478bf51042679bd0c41373da66fa]
#
============================================================
--- packages/icon-slicer/icon-slicer-native_0.3.bb dffa35430308bd5c246351ccb7fe76038291031f
+++ packages/icon-slicer/icon-slicer-native_0.3.bb dffa35430308bd5c246351ccb7fe76038291031f
@@ -0,0 +1,18 @@
+LICENSE = "MIT"
+
+SRC_URI = "http://freedesktop.org/software/icon-slicer/releases/icon-slicer-${PV}.tar.gz"
+
+inherit autotools native
+
+DEPENDS = "gtk+-native popt-native"
+
+S = "${WORKDIR}/icon-slicer-${PV}"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+
============================================================
--- packages/sugar/sugar-artwork/icon-slicer.diff 7e8497cffecae70ae9e041d83ad331daa3691033
+++ packages/sugar/sugar-artwork/icon-slicer.diff 7e8497cffecae70ae9e041d83ad331daa3691033
@@ -0,0 +1,83 @@
+From: Marco Pesenti Gritti <marco at localhost.localdomain>
+Date: Thu, 21 Aug 2008 12:52:39 +0000 (+0200)
+Subject: User icon-slicer to generate the icons, instead of cursorthemegen.
+X-Git-Url: http://dev.laptop.org/git?p=artwork;a=commitdiff_plain;h=2954f4c6d2c178ba005025a94f3d31e54fe37103
+
+User icon-slicer to generate the icons, instead of cursorthemegen.
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,8 @@ AC_PROG_CC
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
+
++AC_PATH_PROG([ICON_SLICER], [icon-slicer])
++
+ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
+ AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
+
+@@ -46,7 +48,6 @@ fi
+ AC_OUTPUT([
+ Makefile
+ cursor/Makefile
+-cursor/cursorthemegen/Makefile
+ cursor/sugar/Makefile
+ icons/Makefile
+ icons/scalable/Makefile
+diff --git a/cursor/Makefile.am b/cursor/Makefile.am
+index 5f0148f..4fa44db 100644
+--- a/cursor/Makefile.am
++++ b/cursor/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = cursorthemegen sugar
++SUBDIRS = sugar
+
+diff --git a/cursor/sugar/Makefile.am b/cursor/sugar/Makefile.am
+index cb9beec..9af934c 100644
+--- a/cursor/sugar/Makefile.am
++++ b/cursor/sugar/Makefile.am
+@@ -1,6 +1,3 @@
+-THEMEGEN = $(top_builddir)/cursor/cursorthemegen/cursorthemegen
+-THEME_DIR = $(top_builddir)/cursor/sugar/theme
+-
+ all-local: sugar.stamp
+
+ sugar_images = \
+@@ -12,26 +9,24 @@ sugar_images = \
+ sugar-05.png \
+ sugar-06.png \
+ sugar-07.png \
+- sugar-08.png \
+- sugar-09.png \
+- sugar-10.png \
+- sugar-11.png \
++ sugar-08.png \
++ sugar-09.png \
++ sugar-10.png \
++ sugar-11.png \
+ sugar-hotspots.png
+
+ sugar.stamp: $(sugar_images) $(THEMEGEN) sugar.cursortheme
+- rm -rf sugar && \
+- BDIR=`pwd` && cd $(srcdir) && \
+- $$BDIR/$(THEMEGEN) sugar.cursortheme $$BDIR/theme && \
+- cd $$BDIR && touch sugar.stamp
++ $(ICON_SLICER) --image-dir=$(srcdir) --output-dir=$(builddir) $(srcdir)/sugar.cursortheme
++ touch sugar.stamp
+
+ clean-local:
+- rm -rf $(THEME_DIR)
+- rm -rf $(top_builddir)/cursor/sugar/sugar.stamp
++ rm -rf cursors
++ rm sugar.stamp
+
+ install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons/sugar/cursors/
+- for i in `cd $(THEME_DIR) && echo *` ; do \
+- $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ; \
++ for i in `cd $(srcdir)/cursors && echo *` ; do \
++ $(INSTALL) $(srcdir)/cursors/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ; \
+ done
+
+ uninstall-local:
============================================================
--- packages/sugar/sugar-artwork_0.82.0.bb 7b7f1a41f826478bf51042679bd0c41373da66fa
+++ packages/sugar/sugar-artwork_0.82.0.bb 7b7f1a41f826478bf51042679bd0c41373da66fa
@@ -0,0 +1,29 @@
+DESCRIPTION = "Sugar artwork"
+LICENSE = "GPLv2"
+
+PR = "r1"
+
+DEPENDS = "sugar icon-slicer-native"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-artwork/${PN}-${PV}.tar.bz2 \
+ file://icon-slicer.diff;patch=1"
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+ mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+ ${datadir}/icons \
+ ${datadir}/themes \
+ ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.*/engines/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
#
# mt diff -rdf88361619c93df2c6573ec7b6bdf56f0e4cda94 -r9f68e99b72ccd68939ca1cab014d1e79dd390bc4
#
#
#
# rename "packages/directfb/directfb_1.1.1.bb"
# to "packages/directfb/directfb_1.2.3.bb"
#
# add_dir "packages/directfb/directfb-1.2.3"
#
# add_file "packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch"
# content [7eb9f5067ab77fa58b944af9d2fe6a8d40866b63]
#
# add_file "packages/directfb/directfb_1.1.1.bb"
# content [2d3add3ec1b53538f6ff50763d4c32884b226774]
#
# patch "packages/directfb/directfb.inc"
# from [4563eb9b40a7a1dbf5bdc129a16d536619b1347d]
# to [b9a7af335a989a5d0012b70b32e85ea327de147c]
#
# patch "packages/directfb/directfb_1.2.3.bb"
# from [2d3add3ec1b53538f6ff50763d4c32884b226774]
# to [a533fec46b1dd083dd1aa1397725c23c7e99fcd1]
#
============================================================
--- packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch 7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
+++ packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch 7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
@@ -0,0 +1,47 @@
+Index: DirectFB-1.1.1/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/directfb-internal.pc.in 2008-07-17 21:00:47.424654304 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I at INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb.pc.in 2007-12-15 16:23:16.000000000 +0100
++++ DirectFB-1.1.1/directfb.pc.in 2008-07-17 20:59:58.044985193 +0200
+@@ -9,4 +9,4 @@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
+ Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
+-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/fusion/fusion.pc.in 2008-07-17 20:58:07.051338866 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in 2008-07-17 20:58:07.054671842 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
============================================================
--- packages/directfb/directfb_1.1.1.bb 2d3add3ec1b53538f6ff50763d4c32884b226774
+++ packages/directfb/directfb_1.1.1.bb 2d3add3ec1b53538f6ff50763d4c32884b226774
@@ -0,0 +1,27 @@
+require directfb.inc
+
+RV = "1.1-0"
+PR = "r0"
+
+DEPENDS += "sysfsutils"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = " \
+ http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+ file://fix-pkgconfig-cflags.patch;patch=1 \
+ file://fix-font-missing-char.patch;patch=1 \
+ file://mkdfiff.patch;patch=1 \
+ file://dont-use-linux-config.patch;patch=1 \
+ file://ts_lib_autotools.patch;patch=1 \
+"
+
+EXTRA_OECONF = "\
+ --enable-freetype=yes \
+ --enable-zlib \
+ --with-gfxdrivers=none \
+ --disable-libmpeg3 \
+ --disable-sdl \
+ --disable-vnc \
+ --disable-x11 \
+"
============================================================
--- packages/directfb/directfb.inc 4563eb9b40a7a1dbf5bdc129a16d536619b1347d
+++ packages/directfb/directfb.inc b9a7af335a989a5d0012b70b32e85ea327de147c
@@ -9,7 +9,7 @@ SRC_URI = " \
DEPENDS = "jpeg libpng freetype zlib tslib"
SRC_URI = " \
- http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+ http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
file://fix-pkgconfig-cflags.patch;patch=1 \
file://fix-font-missing-char.patch;patch=1 \
file://getpagesize.patch;patch=1 \
@@ -21,7 +21,7 @@ LDFLAGS_append =" -lts -lm"
LDFLAGS_append =" -lts -lm"
-inherit autotools pkgconfig
+inherit autotools binconfig pkgconfig
EXTRA_OECONF = "\
--with-gfxdrivers=none \
============================================================
--- packages/directfb/directfb_1.1.1.bb 2d3add3ec1b53538f6ff50763d4c32884b226774
+++ packages/directfb/directfb_1.2.3.bb a533fec46b1dd083dd1aa1397725c23c7e99fcd1
@@ -1,16 +1,13 @@ require directfb.inc
require directfb.inc
-RV = "1.1-0"
+RV = "1.2-0"
PR = "r0"
DEPENDS += "sysfsutils"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = " \
- http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+ http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
file://fix-pkgconfig-cflags.patch;patch=1 \
- file://fix-font-missing-char.patch;patch=1 \
file://mkdfiff.patch;patch=1 \
file://dont-use-linux-config.patch;patch=1 \
file://ts_lib_autotools.patch;patch=1 \
@@ -25,3 +22,7 @@ EXTRA_OECONF = "\
--disable-vnc \
--disable-x11 \
"
+
+LDFLAGS_append = ""
+
+LEAD_SONAME = "libdirectfb-1.2.so.0"
More information about the Openembedded-commits
mailing list