[oe-commits] org.oe.dev merge of 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:43:13 UTC 2007
merge of 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'
and 'fe92fd648b90fb22867f8ea1c1db92ba9e42b7c0'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 2b1cc78c259b50ef47b34d85e4f6717f64d1d093
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2b1cc78c259b50ef47b34d85e4f6717f64d1d093
Files:
1
packages/parted/parted_1.8.2.bb
packages/parted/parted_1.8.7.bb
packages/libxosd
packages/libxosd/files
packages/ipkg-utils/ipkg-utils/fields_tweaks.patch
packages/libxosd/files/autofoo.patch
packages/libxosd/libxosd_svn.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
Diffs:
#
# mt diff -rbfb00d07f52c7b9131c72ba2ccf74615ff161cac -r2b1cc78c259b50ef47b34d85e4f6717f64d1d093
#
#
# no changes
#
#
# mt diff -rfe92fd648b90fb22867f8ea1c1db92ba9e42b7c0 -r2b1cc78c259b50ef47b34d85e4f6717f64d1d093
#
#
#
# rename "packages/parted/parted_1.8.2.bb"
# to "packages/parted/parted_1.8.7.bb"
#
# add_dir "packages/libxosd"
#
# add_dir "packages/libxosd/files"
#
# add_file "packages/ipkg-utils/ipkg-utils/fields_tweaks.patch"
# content [bcce07d7c1acb2892a59f8be552f77994e17e98c]
#
# add_file "packages/libxosd/files/autofoo.patch"
# content [c3a32df0d46b8895a3678e590e8c78f48f5fb2fa]
#
# add_file "packages/libxosd/libxosd_svn.bb"
# content [87c7737c46af2345300a45b3f25c045a94be6f1b]
#
# add_file "packages/parted/parted_1.8.2.bb"
# content [5dcd4b7e6c0cba4fef8d06bacce91b63c20fa29a]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [868608b9c3d57a0724a293da4286ea914bcca16d]
# to [78905ac03fe3db35fb352b69c6d94fa42889ce6a]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [0a2b63e7787803d8ac7b949f62fda5064666c738]
# to [d35a7304f640113a413721c8b4758cfad4a17c72]
#
# patch "packages/parted/parted_1.8.7.bb"
# from [5dcd4b7e6c0cba4fef8d06bacce91b63c20fa29a]
# to [869ca28033957bf8a0406bc4d16876bd71dff378]
#
============================================================
--- packages/ipkg-utils/ipkg-utils/fields_tweaks.patch bcce07d7c1acb2892a59f8be552f77994e17e98c
+++ packages/ipkg-utils/ipkg-utils/fields_tweaks.patch bcce07d7c1acb2892a59f8be552f77994e17e98c
@@ -0,0 +1,70 @@
+---
+ Makefile | 2 ++
+ ipkg-list-fields | 13 +++++++++++++
+ ipkg.py | 8 +++++++-
+ 3 files changed, 22 insertions(+), 1 deletion(-)
+
+Index: ipkg-utils/Makefile
+===================================================================
+--- ipkg-utils.orig/Makefile 2007-06-13 22:45:47.000000000 +0100
++++ ipkg-utils/Makefile 2007-06-13 22:46:50.000000000 +0100
+@@ -15,6 +15,8 @@ install: ${UTILS}
+ python setup.py install
+ chmod agu+rx ipkg-make-index
+ cp -f ipkg-make-index $(PREFIX)/bin
++ chmod agu+rx ipkg-list-fields
++ cp -f ipkg-list-fields $(PREFIX)/bin
+
+ binary: build
+ mkdir -p ipkg-build-binary/usr/bin
+Index: ipkg-utils/ipkg-list-fields
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ipkg-utils/ipkg-list-fields 2007-06-13 22:43:32.000000000 +0100
+@@ -0,0 +1,13 @@
++#!/usr/bin/python
++
++import sys, ipkg
++
++def usage():
++ sys.stderr.write("%s ipk\n" % (sys.argv[0],))
++ sys.exit(-1)
++
++if (len(sys.argv) < 2):
++ usage()
++
++print ipkg.Package(sys.argv[1])
++
+Index: ipkg-utils/ipkg.py
+===================================================================
+--- ipkg-utils.orig/ipkg.py 2007-06-13 22:44:50.000000000 +0100
++++ ipkg-utils/ipkg.py 2007-06-13 22:39:44.000000000 +0100
+@@ -139,6 +139,9 @@ class Package:
+ self.installed_size = None
+ self.filename = None
+ self.isdeb = 0
++ self.homepage = None
++ self.oe = None
++ self.priority = None
+ self.fn = fn
+
+ if fn:
+@@ -211,7 +214,7 @@ class Package:
+ elif self.__dict__.has_key(name):
+ self.__dict__[name] = value
+ else:
+- #print "Lost field %s, %s" % (name,value)
++ print "Lost field %s, %s" % (name,value)
+ pass
+
+ if line and line[0] == '\n':
+@@ -402,6 +405,9 @@ class Package:
+ if self.filename: out = out + "Filename: %s\n" % (self.filename)
+ if self.source: out = out + "Source: %s\n" % (self.source)
+ if self.description: out = out + "Description: %s\n" % (self.description)
++ if self.oe: out = out + "OE: %s\n" % (self.oe)
++ if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
++ if self.priority: out = out + "Priority: %s\n" % (self.priority)
+ out = out + "\n"
+
+ return out
============================================================
--- packages/libxosd/files/autofoo.patch c3a32df0d46b8895a3678e590e8c78f48f5fb2fa
+++ packages/libxosd/files/autofoo.patch c3a32df0d46b8895a3678e590e8c78f48f5fb2fa
@@ -0,0 +1,116 @@
+Index: current/configure.ac
+===================================================================
+--- current.orig/configure.ac 2007-06-14 09:06:04.000000000 +0000
++++ current/configure.ac 2007-06-14 09:14:37.000000000 +0000
+@@ -52,8 +52,6 @@
+ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
+
+ dnl Checks for libraries.
+-AM_PATH_GTK(1.2.2,,
+- AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
+ AC_CHECK_LIB(X11, XInitThreads,,
+ AC_MSG_ERROR([*** X11 not threadsafe ***]))
+ AC_CHECK_LIB(Xext, XShapeQueryExtension,,
+@@ -107,63 +105,6 @@
+ AC_MSG_WARN("beep media player not found")
+ fi
+
+-dnl Check for xmms
+-AM_PATH_XMMS(1.2.7,,
+- AC_MSG_WARN("xmms plugins can not be built"))
+-dnl Override where to place libxmms_xosd.so
+-AC_ARG_WITH([plugindir],
+- AC_HELP_STRING([--with-plugindir=DIR],
+- [Set the xmms plugin directory]),
+- [XMMS_PLUGIN_DIR="$withval"],
+- [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
+-
+-dnl Check for gdk-pixbuf
+-AM_PATH_GDK_PIXBUF(0.22.0,,
+- AC_MSG_WARN("new xmms plugin can not be built"))
+-dnl Override where to place pixmaps for libxmms_xosd.so
+-AC_ARG_WITH([pixmapdir],
+- AC_HELP_STRING([--with-pixmapdir=DIR],
+- [Set the directory for xmms plugin pixmaps]),
+- [XMMS_PIXMAPDIR="$withval"],
+- [XMMS_PIXMAPDIR="${datadir}/xosd"])
+-AC_SUBST(XMMS_PIXMAPDIR)
+-
+-dnl NEW plugin
+-AC_ARG_ENABLE([new-plugin],
+- AC_HELP_STRING([--disable-new-plugin],
+- [Disable new xmms plugin (enabled by default)]),
+- [enable_new_plugin="$enableval"],
+- [enable_new_plugin="yes"])
+-AC_MSG_CHECKING([whether new xmms plugin was requested])
+-AC_MSG_RESULT($enable_new_plugin)
+-AM_CONDITIONAL([BUILD_NEW_PLUGIN],
+- [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"])
+-
+-
+-dnl Check for Beep Media player
+-AC_ARG_ENABLE([beep_media_player_plugin],
+- AC_HELP_STRING([--enable-beep_media_player_plugin],
+- [Enable beep media plugin (enabled by default)]),
+- [beep_media_player_plugin="$enableval"],
+- [beep_media_player_plugin="yes"])
+-AC_MSG_CHECKING([whether beep media plugin was requested])
+-AC_MSG_RESULT($beep_media_player_plugin)
+-
+-AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
+- [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])
+-
+-dnl OLD plugin
+-AC_ARG_ENABLE([old-plugin],
+- AC_HELP_STRING([--enable-old-plugin],
+- [Enable old xmms plugin (disabled by default)]),
+- [enable_old_plugin="$enableval"],
+- [enable_old_plugin="no"])
+-AC_MSG_CHECKING([whether old xmms plugin was requested])
+-AC_MSG_RESULT($enable_old_plugin)
+-AM_CONDITIONAL([BUILD_OLD_PLUGIN],
+- [test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])
+-
+-
+ dnl Define XOSD_VERSION
+ AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")
+
+@@ -174,8 +115,6 @@
+ Makefile
+ src/Makefile
+ src/libxosd/Makefile
+-src/xmms_plugin/Makefile
+-src/bmp_plugin/Makefile
+ macros/Makefile
+ man/Makefile
+ pixmaps/Makefile
+Index: current/src/Makefile.am
+===================================================================
+--- current.orig/src/Makefile.am 2007-06-14 09:06:04.000000000 +0000
++++ current/src/Makefile.am 2007-06-14 09:14:37.000000000 +0000
+@@ -10,6 +10,4 @@
+
+ include_HEADERS = xosd.h
+
+-AM_CFLAGS = ${GTK_CFLAGS}
+-
+-SUBDIRS=libxosd xmms_plugin bmp_plugin
++SUBDIRS=libxosd
+Index: current/Makefile.am
+===================================================================
+--- current.orig/Makefile.am 2007-06-14 09:06:04.000000000 +0000
++++ current/Makefile.am 2007-06-14 09:16:15.000000000 +0000
+@@ -1,11 +1,5 @@
+-if BUILD_NEW_PLUGIN
+- NEW_SUB = pixmaps
+-endif
+-if BUILD_BEEP_MEDIA_PLUGIN
+- NEW_SUB = pixmaps
+-endif
+-SUBDIRS = macros man $(NEW_SUB) src script
+-DIST_SUBDIRS = macros man pixmaps src script
++SUBDIRS = macros man src script
++DIST_SUBDIRS = macros man src script
+
+ DISTCLEANFILES = libtool-disable-static
+
============================================================
--- packages/libxosd/libxosd_svn.bb 87c7737c46af2345300a45b3f25c045a94be6f1b
+++ packages/libxosd/libxosd_svn.bb 87c7737c46af2345300a45b3f25c045a94be6f1b
@@ -0,0 +1,20 @@
+DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
+SECTION = "libs/x11"
+DEPENDS = "virtual/libx11 libxext"
+LICENSE = "LGPL"
+PV = "2.2.15+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/current"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}"
+
============================================================
--- packages/parted/parted_1.8.2.bb 5dcd4b7e6c0cba4fef8d06bacce91b63c20fa29a
+++ packages/parted/parted_1.8.2.bb 5dcd4b7e6c0cba4fef8d06bacce91b63c20fa29a
@@ -0,0 +1,16 @@
+DESCRIPTION = "parted, the GNU partition resizing program"
+HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
+LICENSE = "GPLv2"
+SECTION = "console/tools"
+DEPENDS = "readline e2fsprogs-libs"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+
+#EXTRA_OECONF = "--disable-Werror"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 868608b9c3d57a0724a293da4286ea914bcca16d
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 78905ac03fe3db35fb352b69c6d94fa42889ce6a
@@ -1,7 +1,7 @@ RDEPENDS = ""
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r13"
+PR = "r14"
inherit native
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb 0a2b63e7787803d8ac7b949f62fda5064666c738
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb d35a7304f640113a413721c8b4758cfad4a17c72
@@ -5,13 +5,15 @@ SRCDATE = "20050404"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r15"
+PR = "r16"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
file://ipkg-py-sane-vercompare.patch;patch=1 \
file://ipkg-py-tarfile.patch;patch=1 \
- file://ipkg-make-index-track-stamps.patch;patch=1"
+ file://ipkg-make-index-track-stamps.patch;patch=1 \
+ file://fields_tweaks.patch;patch=1 \
+ "
S = "${WORKDIR}/ipkg-utils"
============================================================
--- packages/parted/parted_1.8.2.bb 5dcd4b7e6c0cba4fef8d06bacce91b63c20fa29a
+++ packages/parted/parted_1.8.7.bb 869ca28033957bf8a0406bc4d16876bd71dff378
@@ -7,10 +7,16 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-$
SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
-#EXTRA_OECONF = "--disable-Werror"
+EXTRA_OECONF = "--disable-Werror"
inherit autotools pkgconfig
+do_configure() {
+ libtoolize --force
+ gnu-configize
+ oe_runconf
+}
+
do_stage() {
autotools_stage_all
}
More information about the Openembedded-commits
mailing list