[oe-commits] org.oe.dev merge of 'b40ff574864609e2e568aaadd2819286b3608596'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Jan 10 15:04:58 UTC 2008
merge of 'b40ff574864609e2e568aaadd2819286b3608596'
and 'ea02b45427ce0c5be80c8d3e8e927a9d71168320'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1ccc031525108c90a7b7bb81f5d84142dc95cfe0
ViewMTN: http://monotone.openembedded.org/revision/info/1ccc031525108c90a7b7bb81f5d84142dc95cfe0
Files:
1
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/evas_cvs.bb
packages/roadmap/roadmap-gtk2-1.0.12
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/roadmap/zroadmap-1.0.12
packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/files/options.mk.patch
packages/roadmap/roadmap-gtk2.inc
packages/agg/agg_2.5.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
Diffs:
#
# mt diff -rb40ff574864609e2e568aaadd2819286b3608596 -r1ccc031525108c90a7b7bb81f5d84142dc95cfe0
#
#
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
# to [0ee8e930339f1d201ab01060c7de4f6f0e484056]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [ee1cbaae633a563dca59af7fa44f9ffc26267d24]
# to [4a00d1d0cad23d61b7411ae50b847f83086398ce]
#
# patch "packages/efl1/ecore.inc"
# from [a23578418f9709d9270c1064bb6e9c82c205d509]
# to [5ef6dea417efa9f7631ce9cec1d293af7ba5a110]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [beca187339858acf3df078a145b9583c19f8fbb7]
# to [34fa2c31d706db70d37636189c65cd730d33abc0]
#
# patch "packages/efl1/evas_cvs.bb"
# from [26e997cd12f7bb18a715bc41e044c55a98858c6c]
# to [90e74de5f2fa3fd6a8b49a0bee9105d6ce33103a]
#
============================================================
--- conf/distro/include/sane-srcdates.inc cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3
+++ conf/distro/include/sane-srcdates.inc 0ee8e930339f1d201ab01060c7de4f6f0e484056
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20071206"
+EFL_SRCDATE = "20080110"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/efl1/ecore-native_cvs.bb ee1cbaae633a563dca59af7fa44f9ffc26267d24
+++ packages/efl1/ecore-native_cvs.bb 4a00d1d0cad23d61b7411ae50b847f83086398ce
@@ -1,7 +1,7 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
-PR = "r2"
+PR = "r0"
EXTRA_OECONF = "\
--enable-ecore-txt \
============================================================
--- packages/efl1/ecore.inc a23578418f9709d9270c1064bb6e9c82c205d509
+++ packages/efl1/ecore.inc 5ef6dea417efa9f7631ce9cec1d293af7ba5a110
@@ -1,18 +1,14 @@ LICENSE = "MIT"
DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
foundation libraries. It makes makes doing selections, drag and drop, event loops, \
timeouts and idle handlers fast, optimized, and convenient."
LICENSE = "MIT"
-DEPENDS = "curl directfb eet evas tslib"
+DEPENDS = "curl eet evas tslib"
# optional
-# DEPENDS += "openssl virtual/libiconv"
+# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
PV = "0.9.9.041+cvs${SRCDATE}"
inherit efl_library
-# SRC_URI += "file://configure.patch;patch=1 \
-# file://fix-tslib-configure.patch;patch=1 \
-# file://fix-directfb-include.patch;patch=1"
-
SRC_URI += "file://fix-directfb-include.patch;patch=1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
============================================================
--- packages/efl1/ecore_cvs.bb beca187339858acf3df078a145b9583c19f8fbb7
+++ packages/efl1/ecore_cvs.bb 34fa2c31d706db70d37636189c65cd730d33abc0
@@ -1,16 +1,17 @@ require ecore.inc
require ecore.inc
-PR = "r5"
+PR = "r0"
EXTRA_OECONF = "\
--enable-ecore-txt \
--disable-ecore-x-xcb \
+ --enable-simple-x11 \
--enable-ecore-x \
--enable-ecore-job \
--disable-ecore-directfb \
--disable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
- --disable-ecore-evas-gl \
+ --disable-ecore-evas-x11-gl \
--enable-ecore-evas-xrender \
--enable-ecore-evas-dfb \
--disable-openssl \
============================================================
--- packages/efl1/evas_cvs.bb 26e997cd12f7bb18a715bc41e044c55a98858c6c
+++ packages/efl1/evas_cvs.bb 90e74de5f2fa3fd6a8b49a0bee9105d6ce33103a
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r4"
+PR = "r0"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
@@ -10,6 +10,7 @@ EXTRA_OECONF = "\
--enable-buffer \
--disable-software-ddraw \
--disable-software-qtopia \
+ --enable-simple-x11 \
--enable-software-x11 \
--enable-software-16-x11 \
--disable-software-xcb \
#
# mt diff -rea02b45427ce0c5be80c8d3e8e927a9d71168320 -r1ccc031525108c90a7b7bb81f5d84142dc95cfe0
#
#
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12"
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
#
# delete "packages/roadmap/roadmap-gtk2_1.0.12.bb"
#
# delete "packages/roadmap/zroadmap-1.0.12"
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch"
#
# delete "packages/roadmap/zroadmap_1.0.12.bb"
#
# add_file "packages/roadmap/files/options.mk.patch"
# content [400094f1965f7aa3f864a63465d0fbe56e3ca672]
#
# add_file "packages/roadmap/roadmap-gtk2.inc"
# content [fc58e3e70037346d52758067318eda8023e6b2be]
#
# patch "packages/agg/agg_2.5.bb"
# from [5441580bb562201cc3991bc4ff439dbf07fde4c4]
# to [afcd52de254ae4cb5f6968371a8c1cd669a753e2]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
# to [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [511a10a8453ed27a0df812a48cdcba14f90788e9]
# to [2790f799a13355e4ee5e15d33a9b0c737fde2269]
#
============================================================
--- packages/roadmap/files/options.mk.patch 400094f1965f7aa3f864a63465d0fbe56e3ca672
+++ packages/roadmap/files/options.mk.patch 400094f1965f7aa3f864a63465d0fbe56e3ca672
@@ -0,0 +1,34 @@
+--- roadmap-1.1.0/src/options.mk.old 2008-01-09 22:08:00.000000000 -0600
++++ roadmap-1.1.0/src/options.mk 2008-01-09 23:06:29.000000000 -0600
+@@ -177,10 +177,7 @@ ifeq ($(strip $(AGG)),NO)
+ else
+ LIBS += -laggfontfreetype -lagg -lfreetype
+ CFLAGS += -DAGG_PIXFMT=pixfmt_$(AGG) \
+- -I$(TOP)/agg_support \
+- -I/usr/include/agg2 \
+- -I/usr/local/include/agg2 \
+- -I/usr/include/freetype2
++ -I$(TOP)/agg_support
+ CANVAS_OBJS = roadmap_canvas_agg.o \
+ $(TOP)/agg_support/roadmap_canvas.o
+ endif
+@@ -188,7 +185,7 @@ endif
+ # bidirectional text lib
+ ifneq ($(strip $(BIDI)),NO)
+ LIBS += -lfribidi
+- CFLAGS += -DUSE_FRIBIDI -I/usr/include/fribidi
++ CFLAGS += -DUSE_FRIBIDI
+ endif
+
+ # RoadMap internal profiling
+@@ -205,8 +202,8 @@ else
+ endif
+
+
+-CFLAGS += -I$(TOP) -I/usr/local/include -DNDEBUG
++CFLAGS += -I$(TOP) -DNDEBUG
+
+-LIBS := -L/usr/local/lib $(LIBS) -lm
++LIBS := $(LIBS) -lm
+
+ CXXFLAGS = $(CFLAGS)
============================================================
--- packages/roadmap/roadmap-gtk2.inc fc58e3e70037346d52758067318eda8023e6b2be
+++ packages/roadmap/roadmap-gtk2.inc fc58e3e70037346d52758067318eda8023e6b2be
@@ -0,0 +1,24 @@
+require roadmap.inc
+
+SECTION = "x11/applications"
+
+DEPENDS = "agg expat gtk+"
+
+EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \
+ POPT=NO SCRIPTS= BUILD= \
+ INSTALLDIR=/usr DESTDIR=${D}"
+
+CFLAGS += " -I${STAGING_INCDIR}/agg2 "
+
+do_compile() {
+ oe_runmake runtime $(TOOLS) icons
+}
+
+do_install() {
+ oe_runmake install
+ mv ${D}/usr/applications ${D}/usr/share/
+
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
============================================================
--- packages/agg/agg_2.5.bb 5441580bb562201cc3991bc4ff439dbf07fde4c4
+++ packages/agg/agg_2.5.bb afcd52de254ae4cb5f6968371a8c1cd669a753e2
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libx11 virtual/libsdl
LICENSE = "AGG License"
DEPENDS = "virtual/libx11 virtual/libsdl freetype"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.antigrain.com/${P}.tar.gz"
S = "${WORKDIR}/${P}"
@@ -32,6 +32,12 @@ do_stage() {
oe_libinstall -a -so libaggplatformsdl ${STAGING_LIBDIR}
install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
install -d ${STAGING_INCDIR}/agg2
+
+ for f in font_freetype font_win32_tt gpc
+ do
+ install -m 0644 ${S}/$f/*.h ${STAGING_INCDIR}/agg2/
+ done
+
cd include
headers=`find . -name "*.h"`
for f in $headers
@@ -39,6 +45,3 @@ do_stage() {
install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f
done
}
-
-
-
============================================================
--- packages/roadmap/roadmap-gtk2_1.1.0.bb 2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d
+++ packages/roadmap/roadmap-gtk2_1.1.0.bb bf65c63e6c550a015ebf7d3afe59f77c139cc5f3
@@ -1,46 +1,11 @@
-require roadmap.inc
+require roadmap-gtk2.inc
-DEPENDS = "agg expat gtk+"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
file://cross.patch;patch=1;pnum=2 \
+ file://options.mk.patch;patch=1;pnum=2 \
file://roadmap.desktop.patch;patch=1 \
- http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
- file://zroadgps.png"
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
S = "${WORKDIR}/roadmap-${PV}/src"
-
-DESKTOP = "GTK2"
-POPT = "NO"
-AGG = "rgba32"
-CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
- -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
-
-do_compile() {
- oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
- oe_runmake -C gpx libgpx.a
- oe_runmake -C unix libosroadmap.a
- oe_runmake -C gtk2 gtkroadmap gtkroadgps
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -d ${D}${datadir}/applications
- install -d ${D}${datadir}/pixmaps
- install -d ${D}${datadir}/roadmap
-
- install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
- install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
-
- install -m 0644 icons/*png ${D}${datadir}/pixmaps/
- install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
-
- install -m 0644 roadmap.desktop ${D}${datadir}/applications/
-
- install -m 0644 sprites preferences ${D}${datadir}/roadmap/
- install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
-}
-
-FILES_${PN} += "${datadir}/roadmap"
-
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
+++ packages/roadmap/roadmap-gtk2_cvs.bb 2790f799a13355e4ee5e15d33a9b0c737fde2269
@@ -1,45 +1,12 @@
-require roadmap.inc
+require roadmap-gtk2.inc
-DEPENDS = "agg expat gtk+"
-PV = "1.1.0+cvs${SRCDATE}"
+PV = "0.0+cvs${SRCDATE}"
PR = "r0"
SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
file://cross.patch;patch=1;pnum=2 \
- http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
- file://zroadgps.png"
+ file://options.mk.patch;patch=1;pnum=2 \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
S = "${WORKDIR}/roadmap/src"
-DESKTOP = "GTK2"
-AGG = "rgba32"
-CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
- -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
-
-do_compile() {
- oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
- oe_runmake -C gpx libgpx.a
- oe_runmake -C unix libosroadmap.a
- oe_runmake -C gtk2 gtkroadmap gtkroadgps
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -d ${D}${datadir}/applications
- install -d ${D}${datadir}/pixmaps
- install -d ${D}${datadir}/roadmap
-
- install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
- install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
-
- install -m 0644 icons/*png ${D}${datadir}/pixmaps/
- install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
-
- install -m 0644 roadmap.desktop ${D}${datadir}/applications/
-
- install -m 0644 sprites preferences ${D}${datadir}/roadmap/
- install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
-}
-
-FILES_${PN} += "${datadir}/roadmap"
-
More information about the Openembedded-commits
mailing list