[oe-commits] org.oe.dev merge of 'a796b081d8845fac70a8842df854fc7d82eb0b27'
oe commit
oe at amethyst.openembedded.net
Tue Apr 8 13:01:30 UTC 2008
merge of 'a796b081d8845fac70a8842df854fc7d82eb0b27'
and 'eb6012f4f544cad5eba77acb92e2eafbff01a119'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 75ad7f56e5c677e715a5cbcb41dd1327e8fcd696
ViewMTN: http://monotone.openembedded.org/revision/info/75ad7f56e5c677e715a5cbcb41dd1327e8fcd696
Files:
1
packages/python/python-pyrtc_svn.bb
conf/distro/chinook-compat.conf
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
packages/libid3tag/files
packages/libid3tag/files/id3tag.pc
packages/libmad/files/add-pkgconfig.patch
packages/mtools/files/no-x11.patch
packages/libid3tag/libid3tag_0.15.1b.bb
packages/libmad/libmad_0.15.1b.bb
packages/mtools/mtools-native_3.9.9.bb
packages/mtools/mtools_3.9.9.bb
Diffs:
#
# mt diff -ra796b081d8845fac70a8842df854fc7d82eb0b27 -r75ad7f56e5c677e715a5cbcb41dd1327e8fcd696
#
#
#
# add_file "packages/python/python-pyrtc_svn.bb"
# content [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
#
# patch "conf/distro/chinook-compat.conf"
# from [bc6984bba9a01e6ec920c499c8fbacfe7533e83e]
# to [271e8379588ab95358ace72a9bc2946e8fcca2b7]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [1474e937489b8938c1858d53c427068ce882e743]
# to [534cab07a9373e1020839557e2432ce088c550e8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
# to [fa679c887c40501f1728c25ffd9222506ce6f366]
#
# patch "packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb"
# from [0bdc20dd566d6175fff6c13e3c54b17e8b1542b9]
# to [b75660af4d2976417371bd6521760757571bf7bd]
#
# patch "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
# from [e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff]
# to [7cee2203504f78f69abd1d1993c7f7b8955ebb4d]
#
# patch "packages/s3c24xx-utils/sjf2410-linux-native_svn.bb"
# from [9063b21889a311b3259a27e13d933e6cb7360f5f]
# to [9a022b0f5e9ee48883d86a30efdf184681913e3a]
#
============================================================
--- packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/chinook-compat.conf bc6984bba9a01e6ec920c499c8fbacfe7533e83e
+++ conf/distro/chinook-compat.conf 271e8379588ab95358ace72a9bc2946e8fcca2b7
@@ -61,8 +61,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4cs20
PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+
# Use recent enough version of the headers to let HAL build successfully.
PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -165,7 +167,7 @@ PREFERRED_PROVIDER_classpath = "classpat
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97"
+PREFERRED_VERSION_classpath = "0.97.1"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -200,3 +202,5 @@ PKG_libconic = "libconic0"
PKG_osso-ic-oss = "osso-ic"
PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
============================================================
--- conf/distro/include/sane-srcdates.inc 1474e937489b8938c1858d53c427068ce882e743
+++ conf/distro/include/sane-srcdates.inc 534cab07a9373e1020839557e2432ce088c550e8
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080330"
+EFL_SRCDATE = "20080409"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
+++ conf/distro/include/sane-srcrevs.inc fa679c887c40501f1728c25ffd9222506ce6f366
@@ -146,8 +146,9 @@ SRCREV_pn-python-formencode = "3148"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
============================================================
--- packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb 0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
+++ packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b75660af4d2976417371bd6521760757571bf7bd
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
============================================================
--- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff
+++ packages/s3c24xx-utils/s3c24xx-gpio_svn.bb 7cee2203504f78f69abd1d1993c7f7b8955ebb4d
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
SECTION = "console/utils"
LICENSE = "GPL"
-PV = "1.0+svn${SRCDATE}"
-PR = "r0"
+PV = "1.0+svn${SRCREV}"
+PR = "r1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
S = "${WORKDIR}/gpio"
============================================================
--- packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9063b21889a311b3259a27e13d933e6cb7360f5f
+++ packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9a022b0f5e9ee48883d86a30efdf184681913e3a
@@ -2,7 +2,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
#
# mt diff -reb6012f4f544cad5eba77acb92e2eafbff01a119 -r75ad7f56e5c677e715a5cbcb41dd1327e8fcd696
#
#
#
# add_dir "packages/libid3tag/files"
#
# add_file "packages/libid3tag/files/id3tag.pc"
# content [9708c6ec9a571d2e8d926c360c075e81a7c65e54]
#
# add_file "packages/libmad/files/add-pkgconfig.patch"
# content [77c60379c969328f307820ed5f273ab0471cafa1]
#
# add_file "packages/mtools/files/no-x11.patch"
# content [1de3be008777c3687aa9c43b69fd8cdaa0cb6163]
#
# patch "packages/libid3tag/libid3tag_0.15.1b.bb"
# from [cdb5428dba02725af96bb371757dd331e8e70bfa]
# to [da6b76d1d8f9c662e3f330657b869f218d2f452e]
#
# patch "packages/libmad/libmad_0.15.1b.bb"
# from [5adf575856900e241c7311e25081db325e13344d]
# to [55e89f58cb09590f6599edf4eef9e25444542c4d]
#
# patch "packages/mtools/mtools-native_3.9.9.bb"
# from [d873957a4396bd9b37c52a8b1b01d2fe91435cf1]
# to [6a9676185aaf5fc3424b861fac845b86e089dc99]
#
# patch "packages/mtools/mtools_3.9.9.bb"
# from [09a02390351b77d8c0672aaed2467a9ae4d5679c]
# to [c33756fcba6df0c011a392de2f759ad9875bdda1]
#
============================================================
--- packages/libid3tag/files/id3tag.pc 9708c6ec9a571d2e8d926c360c075e81a7c65e54
+++ packages/libid3tag/files/id3tag.pc 9708c6ec9a571d2e8d926c360c075e81a7c65e54
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: id3tag
+Description: ID3 tag reading library
+Requires:
+Version: 0.15.0b
+Libs: -L${libdir} -lid3tag -lz
+Cflags: -I${includedir}
============================================================
--- packages/libmad/files/add-pkgconfig.patch 77c60379c969328f307820ed5f273ab0471cafa1
+++ packages/libmad/files/add-pkgconfig.patch 77c60379c969328f307820ed5f273ab0471cafa1
@@ -0,0 +1,68 @@
+Here is a patch for adding pkg-config support to libmad.
+It would make life a bit easier for distro maintainers if this was applied.
+In case you didn't know, pkg-config is a tool for providing LDFLAGS and
+CFLAGS for packages using shared libraries. It's on freedesktop.org.
+Debian has already been distributing the pkg-config file mad.pc with
+libmad for some time, and people developing on debian (notably xmms2
+developers) have started relying on this support being present, causing
+some confusion for people installing from source and on some BSDs which
+do not provide mad.pc (google: pkgconfig libmad).
+
+EMH
+
+--h31gzZEtNLTqOjlF
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: attachment; filename="libmad-0.15.1b-pkgconfig.patch"
+
+diff -Naur libmad-0.15.1b.old/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b.old/configure.ac 2004-01-23 10:41:32.000000000 +0100
++++ libmad-0.15.1b/configure.ac 2004-08-07 02:25:24.633462168 +0200
+@@ -429,5 +429,5 @@
+ dnl AC_SUBST(LTLIBOBJS)
+
+ AC_CONFIG_FILES([Makefile msvc++/Makefile \
+- libmad.list])
++ libmad.list mad.pc])
+ AC_OUTPUT
+diff -Naur libmad-0.15.1b.old/mad.pc.in libmad-0.15.1b/mad.pc.in
+--- libmad-0.15.1b.old/mad.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ libmad-0.15.1b/mad.pc.in 2004-08-07 02:04:59.617692872 +0200
+@@ -0,0 +1,14 @@
++# libmad pkg-config source file
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: mad
++Description: MPEG Audio Decoder
++Version: @VERSION@
++Requires:
++Conflicts:
++Libs: -L${libdir} -lmad -lm
++Cflags: -I${includedir}
+diff -Naur libmad-0.15.1b.old/Makefile.am libmad-0.15.1b/Makefile.am
+--- libmad-0.15.1b.old/Makefile.am 2004-02-17 03:02:03.000000000 +0100
++++ libmad-0.15.1b/Makefile.am 2004-08-07 02:03:19.859858368 +0200
+@@ -24,6 +24,9 @@
+ SUBDIRS =
+ DIST_SUBDIRS = msvc++
+
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = mad.pc
++
+ lib_LTLIBRARIES = libmad.la
+ include_HEADERS = mad.h
+
+@@ -34,7 +37,8 @@
+ minimad_LDADD = libmad.la
+
+ EXTRA_DIST = mad.h.sed \
+- CHANGES COPYRIGHT CREDITS README TODO VERSION
++ CHANGES COPYRIGHT CREDITS README TODO VERSION \
++ mad.pc.in
+
+ exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
+ synth.h decoder.h
+
============================================================
--- packages/mtools/files/no-x11.patch 1de3be008777c3687aa9c43b69fd8cdaa0cb6163
+++ packages/mtools/files/no-x11.patch 1de3be008777c3687aa9c43b69fd8cdaa0cb6163
@@ -0,0 +1,19 @@
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mtools-3.9.9.orig/Makefile.in
++++ mtools-3.9.9/Makefile.in
+@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I at srcdir@ $(USERCFLAGS)
+ CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I at srcdir@ $(USERCFLAGS)
+ LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
+-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS)
++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
+ X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
+
+ all: mtools $(LINKS) mkmanifest @FLOPPYD@
+
+ %.o: %.c
============================================================
--- packages/libid3tag/libid3tag_0.15.1b.bb cdb5428dba02725af96bb371757dd331e8e70bfa
+++ packages/libid3tag/libid3tag_0.15.1b.bb da6b76d1d8f9c662e3f330657b869f218d2f452e
@@ -1,17 +1,23 @@
-DESCRIPTION = "Library for interacting with ID3 tags."
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "zlib"
+DESCRIPTION = "Library for interacting with ID3 tags."
LICENSE = "GPL"
PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
+ file://id3tag.pc"
+
S = "${WORKDIR}/libid3tag-${PV}"
inherit autotools pkgconfig
EXTRA_OECONF = "-enable-speed"
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/id3tag.pc ${S}
+}
do_stage() {
- autotools_stage_all
+ oe_libinstall -so libid3tag ${STAGING_LIBDIR}
+ install -m 0644 id3tag.h ${STAGING_INCDIR}
}
============================================================
--- packages/libmad/libmad_0.15.1b.bb 5adf575856900e241c7311e25081db325e13344d
+++ packages/libmad/libmad_0.15.1b.bb 55e89f58cb09590f6599edf4eef9e25444542c4d
@@ -3,15 +3,16 @@ LICENSE = "GPL"
PRIORITY = "optional"
DEPENDS = "libid3tag"
LICENSE = "GPL"
+PR = "r3"
-PR = "r2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
+ file://add-pkgconfig.patch;patch=1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz"
S = "${WORKDIR}/libmad-${PV}"
SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch;patch=1"
-inherit autotools
+inherit autotools pkgconfig
EXTRA_OECONF = "-enable-speed --enable-shared"
# The ASO's don't take any account of thumb...
@@ -27,3 +28,5 @@ do_stage() {
oe_libinstall -so libmad ${STAGING_LIBDIR}
install -m 0644 mad.h ${STAGING_INCDIR}
}
+
+ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/mtools/mtools-native_3.9.9.bb d873957a4396bd9b37c52a8b1b01d2fe91435cf1
+++ packages/mtools/mtools-native_3.9.9.bb 6a9676185aaf5fc3424b861fac845b86e089dc99
@@ -3,6 +3,5 @@ require mtools_${PV}.bb
# Released under the MIT license (see packages/COPYING)
require mtools_${PV}.bb
-S="${WORKDIR}/mtools-${PV}"
inherit autotools native
============================================================
--- packages/mtools/mtools_3.9.9.bb 09a02390351b77d8c0672aaed2467a9ae4d5679c
+++ packages/mtools/mtools_3.9.9.bb c33756fcba6df0c011a392de2f759ad9875bdda1
@@ -5,12 +5,15 @@ LICENSE="GPL"
DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
HOMEPAGE="http://mtools.linux.lu"
LICENSE="GPL"
-PR = "r2"
+PR = "r4"
SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
file://mtools-makeinfo.patch;patch=1 \
- file://mtools.patch;patch=1"
+ file://mtools.patch;patch=1 \
+ file://no-x11.patch;patch=1"
-#DEPENDS = "tetex-native"
+S = "${WORKDIR}/mtools-${PV}"
inherit autotools
+
+EXTRA_OECONF = "--without-x"
More information about the Openembedded-commits
mailing list