[oe-commits] org.oe.dev merge of '53028d18d16b3a9d612f8bfb2622942c63c8d639'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:29:28 UTC 2007
merge of '53028d18d16b3a9d612f8bfb2622942c63c8d639'
and 'd4ed6162e51ea7347d16180b7ff77713246a7b99'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d41b95dc23a2abd9e172dbf3d9afcd3280005355
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d41b95dc23a2abd9e172dbf3d9afcd3280005355
Files:
1
packages/librsvg/librsvg_2.16.1.bb
packages/gpe-conf/gpe-conf_0.2.3.bb
packages/gpe-conf/gpe-conf_0.2.4.bb
packages/gpe-conf/gpe-conf_0.2.5.bb
packages/gpe-conf/gpe-conf_svn.bb
packages/ltrace/ltrace_0.4.bb
packages/meta/slugos-packages.bb
packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
Diffs:
#
# mt diff -r53028d18d16b3a9d612f8bfb2622942c63c8d639 -rd41b95dc23a2abd9e172dbf3d9afcd3280005355
#
#
#
# add_file "packages/librsvg/librsvg_2.16.1.bb"
# content [17416b5b6fbe102693620623bef9c34ebcc4e4a7]
#
# patch "packages/gpe-conf/gpe-conf_0.2.3.bb"
# from [f06b3f2849492f187bd952f9b758418bdbb41c39]
# to [c21724431d1c4546c61a31f759f9630c63d7f1be]
#
# patch "packages/gpe-conf/gpe-conf_0.2.4.bb"
# from [348303a5c4c9a7735c5bc8e372bfdee6d74c1013]
# to [f1bd884ce02def3011a17baa3c81cceed8624120]
#
# patch "packages/gpe-conf/gpe-conf_0.2.5.bb"
# from [59eff10dcbb35f51f3e0382a763f8cef78811015]
# to [f2d379293b720c3f8d27ad8a09182739e37a22e8]
#
# patch "packages/gpe-conf/gpe-conf_svn.bb"
# from [ac89949684f4c92004725480e4c7a7ca641da595]
# to [f9372dd72f717016764c21b33163d147bd56fc43]
#
# patch "packages/ltrace/ltrace_0.4.bb"
# from [77020e5137564f9e59568b89747adf49b62d14ec]
# to [3ce9b9952390fbe5283a8d3f4734c71ab91a27cd]
#
# patch "packages/meta/slugos-packages.bb"
# from [3208ff840b765fa595e18b0871213e5383c7013b]
# to [e5dcba26701385fb362e40db53c83b26bccb03c2]
#
# patch "packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb"
# from [bca237bccc9b8494eebc95969158b134ce20e8a4]
# to [1b75519a0c4ce7b5f4ee5c30a00cbca7bd7a1534]
#
============================================================
--- packages/librsvg/librsvg_2.16.1.bb 17416b5b6fbe102693620623bef9c34ebcc4e4a7
+++ packages/librsvg/librsvg_2.16.1.bb 17416b5b6fbe102693620623bef9c34ebcc4e4a7
@@ -0,0 +1,25 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
+LICENSE = "LGPL"
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+inherit autotools pkgconfig gnome
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg \
+ ${bindir}/rsvg-view \
+ ${bindir}/rsvg-convert \
+ ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
+ ${libdir}/gtk-2.0/*/*.la"
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug"
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gpe-conf/gpe-conf_0.2.3.bb f06b3f2849492f187bd952f9b758418bdbb41c39
+++ packages/gpe-conf/gpe-conf_0.2.3.bb c21724431d1c4546c61a31f759f9630c63d7f1be
@@ -1,13 +1,13 @@ DEPENDS = "gtk+ esound audiofile libgpew
DESCRIPTION = "Configuration applets for GPE"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
-RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones"
+RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons tzdata"
RDEPENDS_gpe-conf-panel = "gpe-conf"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
============================================================
--- packages/gpe-conf/gpe-conf_0.2.4.bb 348303a5c4c9a7735c5bc8e372bfdee6d74c1013
+++ packages/gpe-conf/gpe-conf_0.2.4.bb f1bd884ce02def3011a17baa3c81cceed8624120
@@ -1,13 +1,13 @@ DEPENDS = "gtk+ esound audiofile libgpew
DESCRIPTION = "Configuration applets for GPE"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
RDEPENDS_gpe-conf-panel = "gpe-conf"
-PR = "r1"
+PR = "r2"
GPE_TARBALL_SUFFIX = "bz2"
============================================================
--- packages/gpe-conf/gpe-conf_0.2.5.bb 59eff10dcbb35f51f3e0382a763f8cef78811015
+++ packages/gpe-conf/gpe-conf_0.2.5.bb f2d379293b720c3f8d27ad8a09182739e37a22e8
@@ -1,16 +1,16 @@ DEPENDS = "gtk+ esound audiofile libgpew
DESCRIPTION = "Configuration applets for GPE"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
RDEPENDS_gpe-conf-panel = "gpe-conf"
RPROVIDES_${PN} += " bl"
RCONFLICTS_${PN} = "bl"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
============================================================
--- packages/gpe-conf/gpe-conf_svn.bb ac89949684f4c92004725480e4c7a7ca641da595
+++ packages/gpe-conf/gpe-conf_svn.bb f9372dd72f717016764c21b33163d147bd56fc43
@@ -6,13 +6,13 @@ DEPENDS = "gtk+ libgpewidget libxsetting
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ntp gpe-login gpe-icons"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons"
+RDEPENDS_${PN} = "xst tzdata xset ntpdate gpe-login gpe-icons"
RDEPENDS_gpe-conf-panel = "gpe-conf"
inherit autotools gpe
PV = "0.2.5+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "${GPE_SVN}"
S = "${WORKDIR}/${PN}"
============================================================
--- packages/ltrace/ltrace_0.4.bb 77020e5137564f9e59568b89747adf49b62d14ec
+++ packages/ltrace/ltrace_0.4.bb 3ce9b9952390fbe5283a8d3f4734c71ab91a27cd
@@ -1,31 +1,63 @@ LICENSE = "GPL"
DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
SECTION = "devel"
DEPENDS = "libelf"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \
- ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
+ ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
file://no-usr-include.patch;patch=1"
inherit autotools
PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "ARCH=${LTRACE_ARCH} \
- INSTALL_FILE='$(INSTALL) -p -m 0644' \
+EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \
INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \
INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \
INSTALL_DIR='$(INSTALL) -p -d -m 0755' "
export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
-LTRACE_ARCH = "${TARGET_ARCH}"
-LTRACE_ARCH_x86 = "i386"
-
do_configure_prepend() {
ln -sf ./linux-gnu sysdeps/linux-gnueabi
}
do_compile() {
- oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE}
+ case ${TARGET_ARCH} in
+ alpha*) LTRACE_ARCH=alpha ;;
+ arm*) LTRACE_ARCH=arm ;;
+ cris*) LTRACE_ARCH=cris ;;
+ hppa*) LTRACE_ARCH=parisc ;;
+ i*86*) LTRACE_ARCH=i386 ;;
+ ia64*) LTRACE_ARCH=ia64 ;;
+ mips*) LTRACE_ARCH=mips ;;
+ m68k*) LTRACE_ARCH=m68k ;;
+ powerpc*) LTRACE_ARCH=ppc ;;
+ s390*) LTRACE_ARCH=s390 ;;
+ sh*) LTRACE_ARCH=sh ;;
+ sparc64*) LTRACE_ARCH=sparc64 ;;
+ sparc*) LTRACE_ARCH=sparc ;;
+ x86_64*) LTRACE_ARCH=x86_64 ;;
+ esac
+ oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH}
}
+
+do_install() {
+ case ${TARGET_ARCH} in
+ alpha*) LTRACE_ARCH=alpha ;;
+ arm*) LTRACE_ARCH=arm ;;
+ cris*) LTRACE_ARCH=cris ;;
+ hppa*) LTRACE_ARCH=parisc ;;
+ i*86*) LTRACE_ARCH=i386 ;;
+ ia64*) LTRACE_ARCH=ia64 ;;
+ mips*) LTRACE_ARCH=mips ;;
+ m68k*) LTRACE_ARCH=m68k ;;
+ powerpc*) LTRACE_ARCH=ppc ;;
+ s390*) LTRACE_ARCH=s390 ;;
+ sh*) LTRACE_ARCH=sh ;;
+ sparc64*) LTRACE_ARCH=sparc64 ;;
+ sparc*) LTRACE_ARCH=sparc ;;
+ x86_64*) LTRACE_ARCH=x86_64 ;;
+ esac
+ oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D}
+}
============================================================
--- packages/meta/slugos-packages.bb 3208ff840b765fa595e18b0871213e5383c7013b
+++ packages/meta/slugos-packages.bb e5dcba26701385fb362e40db53c83b26bccb03c2
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r28"
+PR = "r29"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -47,6 +47,7 @@ SLUGOS_PACKAGES = "\
cyrus-imapd \
cyrus-sasl \
db \
+ devio \
devlabel \
diffstat \
diffutils \
@@ -154,6 +155,7 @@ SLUGOS_PACKAGES = "\
setpwc \
setserial \
sipsak \
+ slugimage \
smartmontools \
ssmtp \
strace \
@@ -165,6 +167,7 @@ SLUGOS_PACKAGES = "\
tiff \
tzdata \
unzip \
+ upslug2 \
usbutils \
util-linux \
vim \
============================================================
--- packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb bca237bccc9b8494eebc95969158b134ce20e8a4
+++ packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb 1b75519a0c4ce7b5f4ee5c30a00cbca7bd7a1534
@@ -1,9 +1,9 @@ DESCRIPTION = "Xaw is the X Athena Widge
require xorg-lib-common.inc
DESCRIPTION = "Xaw is the X Athena Widget Set."
-
DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
PROVIDES = "xaw"
+PR = "r1"
XORG_PN = "libXaw"
@@ -13,3 +13,9 @@ do_stage () {
ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
}
+
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+
+FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
#
# mt diff -rd4ed6162e51ea7347d16180b7ff77713246a7b99 -rd41b95dc23a2abd9e172dbf3d9afcd3280005355
#
#
# no changes
#
More information about the Openembedded-commits
mailing list