From cd93cd62db9b4462932ef66a00f163d3286b2a34 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 19:16:48 +0000 Subject: classpath: update from Andrew Paulsen. partly closes 2296. * update classpath-gtk. fix $PN-issue. * add classpath-gtk_cvs * add classpath-minimal-native --- packages/classpath/classpath-gtk_0.90.bb | 16 -------- packages/classpath/classpath-gtk_0.93.bb | 16 ++++++++ packages/classpath/classpath-gtk_cvs.bb | 45 ++++++++++++++++++++++ .../classpath/classpath-minimal-native_0.93.bb | 17 ++++++++ packages/classpath/classpath.inc | 2 +- packages/classpath/files/gconf_version.patch | 11 ++++++ 6 files changed, 90 insertions(+), 17 deletions(-) delete mode 100644 packages/classpath/classpath-gtk_0.90.bb create mode 100644 packages/classpath/classpath-gtk_0.93.bb create mode 100644 packages/classpath/classpath-gtk_cvs.bb create mode 100644 packages/classpath/classpath-minimal-native_0.93.bb create mode 100644 packages/classpath/files/gconf_version.patch (limited to 'packages') diff --git a/packages/classpath/classpath-gtk_0.90.bb b/packages/classpath/classpath-gtk_0.90.bb deleted file mode 100644 index b83d23d9c0..0000000000 --- a/packages/classpath/classpath-gtk_0.90.bb +++ /dev/null @@ -1,16 +0,0 @@ -require classpath.inc - -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" -RDEPENDS_${PBN}-gtk = "${PBN}-common (>= ${PV})" -RCONFLICTS_${PBN}-gtk = "${PBN}-minimal" - -EXTRA_OECONF = "--with-jikes" - -PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}" - -FILES_${PBN}-doc = "${datadir}/info" -FILES_${PBN}-dev = "${includedir}" -FILES_${PN} = "${libdir}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip" -FILES_${PBN}-examples = "${datadir}/${PBN}/examples" -FILES_${PBN}-tools = "${datadir}/${PBN}/tools" diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb new file mode 100644 index 0000000000..9577947a0c --- /dev/null +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -0,0 +1,16 @@ +require classpath.inc + +DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb new file mode 100644 index 0000000000..111f1bf6b8 --- /dev/null +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +LICENSE = "Classpath" +PRIORITY = "optional" +SECTION = "libs" + +SRCDATE_${PN} ?= "20070501" +PV = "0.93+cvs${SRCDATE}" + +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \ + file://disable-automake-checks.patch;patch=1" + +S = "${WORKDIR}/classpath" + +inherit autotools + +EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info ${datadir}/man" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} + +PROVIDES = "classpath" +RPROVIDES = "classpath" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb new file mode 100644 index 0000000000..05fd9b8557 --- /dev/null +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -0,0 +1,17 @@ +inherit native +require classpath.inc + +DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" + +EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + : +} diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 303c286d4e..459788c93a 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -8,7 +8,7 @@ PBN = "classpath" SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \ file://disable-automake-checks.patch;patch=1 \ - file://fix-endian-arm-floats.patch;patch=1" + file://gconf_version.patch;patch=1" S = "${WORKDIR}/${PBN}-${PV}" diff --git a/packages/classpath/files/gconf_version.patch b/packages/classpath/files/gconf_version.patch new file mode 100644 index 0000000000..b1be1209a2 --- /dev/null +++ b/packages/classpath/files/gconf_version.patch @@ -0,0 +1,11 @@ +--- classpath-0.93/configure.ac~ 2007-03-29 15:52:30.000000000 -0500 ++++ classpath-0.93/configure.ac 2007-03-29 15:52:30.000000000 -0500 +@@ -496,7 +496,7 @@ + + dnl gconf-peer + if test "x${COMPILE_GCONF_PEER}" = xyes; then +- PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2) ++ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0) + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + dnl we also need gdk for locking -- cgit v1.2.3 From c35c6b82f6ab32b19f4d228c8568b87d3628299f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 21:19:24 +0000 Subject: gpe-timesheet: unify --- packages/gpe-timesheet/gpe-timesheet.inc | 10 ++++++++++ packages/gpe-timesheet/gpe-timesheet_0.30.bb | 8 +------- packages/gpe-timesheet/gpe-timesheet_0.31.bb | 8 +------- packages/gpe-timesheet/gpe-timesheet_svn.bb | 9 ++------- 4 files changed, 14 insertions(+), 21 deletions(-) create mode 100644 packages/gpe-timesheet/gpe-timesheet.inc (limited to 'packages') diff --git a/packages/gpe-timesheet/gpe-timesheet.inc b/packages/gpe-timesheet/gpe-timesheet.inc new file mode 100644 index 0000000000..11c1327752 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "GPE time tracker" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libgpewidget gtk+ sqlite libtododb" +RDEPENDS = "gpe-icons" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.30.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.31.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_svn.bb b/packages/gpe-timesheet/gpe-timesheet_svn.bb index 0eae00b1ca..28eb65d31b 100644 --- a/packages/gpe-timesheet/gpe-timesheet_svn.bb +++ b/packages/gpe-timesheet/gpe-timesheet_svn.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "GPE time tracker" -SECTION = "gpe" -LICENSE = "GPL" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -RDEPENDS = "gpe-icons" +require gpe-timesheet.inc + PR = "r1" PV = "0.31+svn-${SRCDATE}" -inherit autotools - SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 231621187c6a1d8f25949484e100dd8256ba141e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 21:28:53 +0000 Subject: gpe-what: unify --- packages/gpe-what/gpe-what.inc | 8 ++++++++ packages/gpe-what/gpe-what_0.30.bb | 7 +------ packages/gpe-what/gpe-what_0.31.bb | 5 +---- packages/gpe-what/gpe-what_0.33.bb | 5 +---- packages/gpe-what/gpe-what_0.41.bb | 9 +-------- packages/gpe-what/gpe-what_0.42.bb | 9 +-------- packages/gpe-what/gpe-what_0.43.bb | 8 ++------ packages/gpe-what/gpe-what_svn.bb | 7 ++----- 8 files changed, 17 insertions(+), 41 deletions(-) create mode 100644 packages/gpe-what/gpe-what.inc (limited to 'packages') diff --git a/packages/gpe-what/gpe-what.inc b/packages/gpe-what/gpe-what.inc new file mode 100644 index 0000000000..fd4307631e --- /dev/null +++ b/packages/gpe-what/gpe-what.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "GPE modal help" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 gtk+" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb index 9c711a624d..165ea4cc3b 100644 --- a/packages/gpe-what/gpe-what_0.30.bb +++ b/packages/gpe-what/gpe-what_0.30.bb @@ -1,9 +1,4 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe - -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11" +require gpe-what.inc do_compile_prepend() { rm *.d diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb index 362e573538..50a614bdd2 100644 --- a/packages/gpe-what/gpe-what_0.31.bb +++ b/packages/gpe-what/gpe-what_0.31.bb @@ -1,6 +1,3 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb index ed7c7577ec..71ae7dac95 100644 --- a/packages/gpe-what/gpe-what_0.33.bb +++ b/packages/gpe-what/gpe-what_0.33.bb @@ -1,8 +1,5 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc SRC_URI += "file://makefile-fix.patch;patch=1" -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.41.bb +++ b/packages/gpe-what/gpe-what_0.41.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.42.bb +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb index b82da4ff7f..624f2e365e 100644 --- a/packages/gpe-what/gpe-what_0.43.bb +++ b/packages/gpe-what/gpe-what_0.43.bb @@ -1,9 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" -PR = "r1" +require gpe-what.inc -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe +PR = "r1" SRC_URI += " file://set-wm-hint.patch;patch=1;pnum=0" diff --git a/packages/gpe-what/gpe-what_svn.bb b/packages/gpe-what/gpe-what_svn.bb index 7ecaf20a2f..c448751096 100644 --- a/packages/gpe-what/gpe-what_svn.bb +++ b/packages/gpe-what/gpe-what_svn.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE modal help" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 gtk+" -PV = "0.41+svn${SRCDATE}" +require gpe-what.inc -inherit autotools +PV = "0.41+svn${SRCDATE}" SRC_URI = "${GPE_SVN}" -- cgit v1.2.3 From 45332ba9654a4f5b51ed4770f1c9db53f23e81e2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 21:43:30 +0000 Subject: gtkhtml: unify --- packages/gtkhtml/gtkhtml-2.0_2.6.3.bb | 13 +++---------- packages/gtkhtml/gtkhtml-3.0_3.0.10.bb | 10 ++-------- packages/gtkhtml/gtkhtml-3.1_3.1.16.bb | 10 ++-------- packages/gtkhtml/gtkhtml-3.6_3.6.2.bb | 10 ++-------- packages/gtkhtml/gtkhtml-3.8_3.8.2.bb | 10 ++-------- packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb | 10 ++-------- packages/gtkhtml/gtkhtml.inc | 10 ++++++++++ 7 files changed, 23 insertions(+), 50 deletions(-) create mode 100644 packages/gtkhtml/gtkhtml.inc (limited to 'packages') diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index 33b0423e25..f44e8b57a6 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -1,22 +1,15 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r0" -inherit gnome - SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz" - FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/libgtkhtml2-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { - mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true + mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true autotools_stage_all } diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb index d27f72ae4a..66993cec74 100644 --- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -1,18 +1,12 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r2" -inherit gnome - SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \ file://fix-missing-colormap.patch;patch=1" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb index 2b57a0b2c4..1e389dabe0 100644 --- a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb +++ b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.1" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.1.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb index 6194529aa0..fd5fde49ed 100644 --- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb +++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.6" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.6.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb index 1db83609c2..cc177de08f 100644 --- a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb +++ b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.8.pc || true diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 14e6818e7b..44a96d6d64 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -1,17 +1,11 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libgnomeprint orbit2-native" PR = "r1" -inherit gnome - SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml.inc b/packages/gtkhtml/gtkhtml.inc new file mode 100644 index 0000000000..f7a346a67a --- /dev/null +++ b/packages/gtkhtml/gtkhtml.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTML rendering/editing library" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL" + +inherit gnome + +S = "${WORKDIR}/gtkhtml-${PV}" + +EXTRA_OECONF = "--disable-gtk-doc" -- cgit v1.2.3 From 8f86b570c703eb96001488d96f4195fe02bb32ff Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 21:57:15 +0000 Subject: hal: unify --- packages/hal/hal.inc | 10 ++++++++++ packages/hal/hal_0.2.98.bb | 11 ++--------- packages/hal/hal_0.5.2.bb | 11 ++--------- packages/hal/hal_0.5.4.bb | 11 ++--------- packages/hal/hal_0.5.7.bb | 12 +++--------- packages/hal/hal_0.5.8.1.bb | 12 ++---------- packages/hal/hal_0.5.9.bb | 12 ++---------- 7 files changed, 23 insertions(+), 56 deletions(-) create mode 100644 packages/hal/hal.inc (limited to 'packages') diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc new file mode 100644 index 0000000000..11a6531951 --- /dev/null +++ b/packages/hal/hal.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Hardware Abstraction Layer" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL LGPL AFL" + +SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" + +S = "${WORKDIR}/hal-${PV}" + +inherit autotools pkgconfig diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb index 7c8b8b73eb..468a948b1a 100644 --- a/packages/hal/hal_0.2.98.bb +++ b/packages/hal/hal_0.2.98.bb @@ -1,14 +1,7 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb index fd29980e56..1ca95e8739 100644 --- a/packages/hal/hal_0.5.2.bb +++ b/packages/hal/hal_0.5.2.bb @@ -1,15 +1,8 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb index 147439d4c3..1246637f67 100644 --- a/packages/hal/hal_0.5.4.bb +++ b/packages/hal/hal_0.5.4.bb @@ -1,18 +1,11 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig - EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb index 5933676260..05a3ea010b 100644 --- a/packages/hal/hal_0.5.7.bb +++ b/packages/hal/hal_0.5.7.bb @@ -1,17 +1,11 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://dbus-fix-api.patch;patch=1" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://dbus-fix-api.patch;patch=1" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb index f608c4018c..d0b888192c 100644 --- a/packages/hal/hal_0.5.8.1.bb +++ b/packages/hal/hal_0.5.8.1.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "dbus-glib udev intltool expat libusb" RDEPENDS += "udev" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r2" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index bb9dc82b52..79d53970f3 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb" RDEPENDS += "udev hal-info" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ -- cgit v1.2.3 From 5f2625742734eb1155134a366629294e380debd1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 22:10:41 +0000 Subject: intltool: unify --- packages/intltool/intltool-native_0.30.bb | 2 +- packages/intltool/intltool-native_0.31.bb | 2 +- packages/intltool/intltool-native_0.34.bb | 2 +- packages/intltool/intltool-native_0.35.0.bb | 4 ++-- packages/intltool/intltool.inc | 13 +++++++++++++ packages/intltool/intltool_0.30.bb | 13 +------------ packages/intltool/intltool_0.31.bb | 13 +------------ packages/intltool/intltool_0.34.bb | 13 +------------ packages/intltool/intltool_0.35.0.bb | 14 ++------------ packages/intltool/intltool_0.35.2.bb | 14 ++------------ 10 files changed, 25 insertions(+), 65 deletions(-) create mode 100644 packages/intltool/intltool.inc (limited to 'packages') diff --git a/packages/intltool/intltool-native_0.30.bb b/packages/intltool/intltool-native_0.30.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.30.bb +++ b/packages/intltool/intltool-native_0.30.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.31.bb +++ b/packages/intltool/intltool-native_0.31.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.34.bb b/packages/intltool/intltool-native_0.34.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.34.bb +++ b/packages/intltool/intltool-native_0.34.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb index fdd2652e11..bac5378113 100644 --- a/packages/intltool/intltool-native_0.35.0.bb +++ b/packages/intltool/intltool-native_0.35.0.bb @@ -1,7 +1,7 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" -export PERL="/usr/bin/env perl" +export PERL = "/usr/bin/env perl" SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc new file mode 100644 index 0000000000..f4de1ff4aa --- /dev/null +++ b/packages/intltool/intltool.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Utility scripts for internationalizing XML" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" + +SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/intltool/intltool_0.30.bb b/packages/intltool/intltool_0.30.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.30.bb +++ b/packages/intltool/intltool_0.30.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.31.bb +++ b/packages/intltool/intltool_0.31.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.34.bb b/packages/intltool/intltool_0.34.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.34.bb +++ b/packages/intltool/intltool_0.34.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb index de8705ccf0..6dea51a5fc 100644 --- a/packages/intltool/intltool_0.35.0.bb +++ b/packages/intltool/intltool_0.35.0.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r1" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb index daba37a9da..6626ed54fe 100644 --- a/packages/intltool/intltool_0.35.2.bb +++ b/packages/intltool/intltool_0.35.2.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r0" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} -- cgit v1.2.3 From 7c62fe0547ac8601b0583747eb6a40ab14e74697 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 23:15:47 +0000 Subject: classpath: make disable-automake-checks apply to CVS version of classpath-gtk --- packages/classpath/classpath-gtk_cvs.bb | 3 ++- packages/classpath/files/disable-automake-checks-v2.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/classpath/files/disable-automake-checks-v2.patch (limited to 'packages') diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index 111f1bf6b8..53f494ab15 100644 --- a/packages/classpath/classpath-gtk_cvs.bb +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "Classpath" PRIORITY = "optional" SECTION = "libs" +PR = "r1" SRCDATE_${PN} ?= "20070501" PV = "0.93+cvs${SRCDATE}" @@ -12,7 +13,7 @@ RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \ - file://disable-automake-checks.patch;patch=1" + file://disable-automake-checks-v2.patch;patch=1" S = "${WORKDIR}/classpath" diff --git a/packages/classpath/files/disable-automake-checks-v2.patch b/packages/classpath/files/disable-automake-checks-v2.patch new file mode 100644 index 0000000000..0c1df1acae --- /dev/null +++ b/packages/classpath/files/disable-automake-checks-v2.patch @@ -0,0 +1,11 @@ +--- sablevm-classpath-1.1.7/configure.ac.orig 2004-11-26 00:23:01.000000000 +0100 ++++ sablevm-classpath-1.1.7/configure.ac 2004-11-26 00:23:46.000000000 +0100 +@@ -34,7 +34,7 @@ + AC_SUBST(CLASSPATH_MODULE) + + AC_PREREQ(2.59) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local) + -- cgit v1.2.3 From 49e3d54393d3e30008c9583a8d7fec531f45bcea Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 23 May 2007 23:36:44 +0000 Subject: classpath: revert seemingly erroneous manipulations of SRC_URI in classpath.inc Add gconf_version.patch explicitly to the SRC_URI where appropriate --- packages/classpath/classpath-gtk_0.93.bb | 2 ++ packages/classpath/classpath-minimal-native_0.93.bb | 5 ++++- packages/classpath/classpath.inc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb index 9577947a0c..137ee8ffb2 100644 --- a/packages/classpath/classpath-gtk_0.93.bb +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip- RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" +SRC_URI += "file://gconf_version.patch;patch=1" + EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb index 05fd9b8557..8a08a6c1ce 100644 --- a/packages/classpath/classpath-minimal-native_0.93.bb +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -1,8 +1,11 @@ -inherit native require classpath.inc DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" +SRC_URI += "file://gconf_version.patch;patch=1" + +inherit native + EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples" do_stage() { diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 459788c93a..303c286d4e 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -8,7 +8,7 @@ PBN = "classpath" SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \ file://disable-automake-checks.patch;patch=1 \ - file://gconf_version.patch;patch=1" + file://fix-endian-arm-floats.patch;patch=1" S = "${WORKDIR}/${PBN}-${PV}" -- cgit v1.2.3 From 7191c158cda9c6d7b08bd156951142bc364d56ea Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 24 May 2007 10:33:56 +0000 Subject: mpeg2dec: set it to provide and rprovide libmpeg2 (just to be safe, bug 375) --- packages/mpeg2dec/mpeg2dec_0.4.0b.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb index 3380a4e00c..2329fbd4d5 100644 --- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb +++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb @@ -1,14 +1,14 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams" HOMEPAGE = "http://libmpeg2.sourceforge.net/" -LICENSE = "GPL" -PRIORITY = "optional" SECTION = "libs" -PR = "r2" - +PRIORITY = "optional" +LICENSE = "GPL" DEPENDS = "virtual/libsdl" +PROVIDES += "libmpeg2" +RPROVIDES += "libmpeg2" +PR = "r3" SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz" -S = "${WORKDIR}/mpeg2dec-0.4.0" inherit autotools pkgconfig -- cgit v1.2.3 From f082133d4ff55ed8a1375d3965e9b788ca55fa3e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 24 May 2007 10:59:54 +0000 Subject: scummvm: introduce SOURCEFORGE_MIRROR variable. some minor clean-up. --- packages/scummvm/scummvm-qpe_0.6.1b.bb | 3 ++- packages/scummvm/scummvm.inc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 50d107deeb..b66d58671a 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,7 +1,8 @@ require scummvm.inc + DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" -S="${WORKDIR}/scummvm-${PV}/" +S = "${WORKDIR}/scummvm-${PV}/" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 24b1e5a12a..28257fab4b 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://puzzle.dl.sourceforge.net/scummvm/scummvm-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" inherit autotools -- cgit v1.2.3 From 7872e547cbf3aeb1597efcfbe5310fe20303fdd2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 May 2007 13:10:23 +0000 Subject: xserver-kdrive-common: fix typo --- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver | 2 +- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver index 66feaad499..e59460f3b0 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver @@ -96,7 +96,7 @@ case `module_id` in ;; "GTA01") ARGS="$ARGS -dpi 285 -screen 480x640" ;; - Nokia N800") + "Nokia N800") ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; *) # Its a device we dont know about - in which case force diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 108f0c63fb..9d9b577766 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r13" +PR = "r14" SRC_URI = "file://etc" S = ${WORKDIR} -- cgit v1.2.3 From b14817b1d05d06f5deb04c8bc79e359c874deb62 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 May 2007 15:26:46 +0000 Subject: bluez: update libs and utils to 3.11 --- packages/bluez/bluez-libs_3.11.bb | 1 + packages/bluez/bluez-utils_3.10.1.bb | 115 ----------------------------------- packages/bluez/bluez-utils_3.11.bb | 115 +++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 115 deletions(-) create mode 100644 packages/bluez/bluez-libs_3.11.bb delete mode 100644 packages/bluez/bluez-utils_3.10.1.bb create mode 100644 packages/bluez/bluez-utils_3.11.bb (limited to 'packages') diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.11.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.10.1.bb deleted file mode 100644 index 44827dc2d0..0000000000 --- a/packages/bluez/bluez-utils_3.10.1.bb +++ /dev/null @@ -1,115 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://02dtl1_cs.sh \ - " -PR = "r3" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume -FILES_${PN} += "${sysconfdir}/apm/" - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb new file mode 100644 index 0000000000..6ac6c8f977 --- /dev/null +++ b/packages/bluez/bluez-utils_3.11.bb @@ -0,0 +1,115 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + " +PR = "r0" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume +FILES_${PN} += "${sysconfdir}/apm/" + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + -- cgit v1.2.3 From c8868830e90a365e6536e486ab2944f735e856fa Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 24 May 2007 16:07:33 +0000 Subject: glibmm and gtkmm: fix incorrect dependencies. Fixes bug 1923. --- packages/glibmm/glibmm_2.8.4.bb | 4 ++-- packages/gtkmm/gtkmm.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/glibmm/glibmm_2.8.4.bb b/packages/glibmm/glibmm_2.8.4.bb index a1235ae563..1819114cb1 100644 --- a/packages/glibmm/glibmm_2.8.4.bb +++ b/packages/glibmm/glibmm_2.8.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "gtk+ libsigc++-2.0" -PR = "r1" +DEPENDS = "glib-2.0 libsigc++-2.0" +PR = "r2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-${PV}.tar.bz2" diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc index 843274fdc5..f0c6dc093b 100644 --- a/packages/gtkmm/gtkmm.inc +++ b/packages/gtkmm/gtkmm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "glibmm" +DEPENDS = "glibmm gtk+" inherit autotools pkgconfig flow-lossage -- cgit v1.2.3 From b21741e8b47255b19fcf81dd9acfaf7f7f2c7053 Mon Sep 17 00:00:00 2001 From: Antti Andreimann Date: Thu, 24 May 2007 16:12:39 +0000 Subject: mesa: fix build on FC6, closes #2363 --- packages/mesa/mesa-mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mesa/mesa-mesa.inc b/packages/mesa/mesa-mesa.inc index a4163f576e..d794f0c097 100644 --- a/packages/mesa/mesa-mesa.inc +++ b/packages/mesa/mesa-mesa.inc @@ -13,7 +13,7 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" do_configure() { cd configs - ln -sf linux current + cp linux current sed -e "s%CC *= *.*%CC = ${CC}%" -i current sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current sed -e "s%LD *= *.*%LD = ${LD}%" -i current -- cgit v1.2.3 From 34dde4e4767cc985e246b24f5c4e2eb5934f3b4c Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 24 May 2007 17:06:05 +0000 Subject: Add The Hentges ROM 2.x ( based on Ansgtrom ) to OE. Very early state. --- packages/images/hentges-console-image.bb | 37 ++++++++++++++++++++++++ packages/images/hentges-x11-image.bb | 48 ++++++++++++++++++++++++++++++++ packages/tasks/task-hentges-base.bb | 29 +++++++++++++++++++ packages/tasks/task-hentges-x11.bb | 29 +++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 packages/images/hentges-console-image.bb create mode 100644 packages/images/hentges-x11-image.bb create mode 100644 packages/tasks/task-hentges-base.bb create mode 100644 packages/tasks/task-hentges-x11.bb (limited to 'packages') diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb new file mode 100644 index 0000000000..c748c14aaa --- /dev/null +++ b/packages/images/hentges-console-image.bb @@ -0,0 +1,37 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: hentges-console-image.bb +# Date: 20070516 (YMD) + +DESCRIPTION = "Hentges Console Image" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +export IMAGE_NAME = "hentges-console-image" +export IMAGE_LINGUAS = "" +export PACKAGE_INSTALL = "${RDEPENDS}" + +###################################################################################### + +DEPENDS = "task-base \ + task-hentges-base" + +RDEPENDS = "task-base \ + task-hentges-base" + +###################################################################################### + +inherit image + + diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb new file mode 100644 index 0000000000..84a4fec94f --- /dev/null +++ b/packages/images/hentges-x11-image.bb @@ -0,0 +1,48 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: hentges-x11-image.bb +# Date: 20070522 (YMD) + +DESCRIPTION = "Hentges X11 Image" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "MIT" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +export IMAGE_NAME = "hentges-x11-image" +export IMAGE_LINGUAS = "" +export PACKAGE_INSTALL = "${RDEPENDS}" + +###################################################################################### + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" + +###################################################################################### + +DEPENDS = "task-base \ + task-hentges-base \ + task-hentges-x11" + +RDEPENDS = "task-base \ + task-hentges-base \ + task-hentges-x11" + +###################################################################################### + +inherit image + + diff --git a/packages/tasks/task-hentges-base.bb b/packages/tasks/task-hentges-base.bb new file mode 100644 index 0000000000..894197f381 --- /dev/null +++ b/packages/tasks/task-hentges-base.bb @@ -0,0 +1,29 @@ +# +# Copyright Matthias Hentges (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: task-hentges-base.bb +# Date: 20070516 (YMD) + +DESCRIPTION = "task-hentges-base" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "MIT" + +###################################################################################### + +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +#DEPENDS = "${HENTGES_DEPENDS}" +# +RDEPENDS = "${HENTGES_BASE_RDEPENDS}" diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb new file mode 100644 index 0000000000..abd7b525c5 --- /dev/null +++ b/packages/tasks/task-hentges-x11.bb @@ -0,0 +1,29 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: task-hentges-x11.bb +# Date: 20070522 (YMD) + +DESCRIPTION = "task-hentges-x11" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "MIT" + +###################################################################################### + +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +###################################################################################### + +PV = "${HENTGES_PV}" +PR = "${HENTGES_PR}" + +###################################################################################### + +DEPENDS = "task-angstrom-x11" + +RDEPENDS = "${HENTGES_X11_RDEPENDS}" -- cgit v1.2.3 From 9a1528918ee690410e9522631f99abbac6e2a184 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 24 May 2007 17:12:09 +0000 Subject: Fix license --- packages/images/hentges-console-image.bb | 3 ++- packages/tasks/task-hentges-x11.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb index c748c14aaa..24235b2887 100644 --- a/packages/images/hentges-console-image.bb +++ b/packages/images/hentges-console-image.bb @@ -1,7 +1,8 @@ #! /bin/sh # # Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) # # Filename: hentges-console-image.bb # Date: 20070516 (YMD) diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb index abd7b525c5..87c89d6a4c 100644 --- a/packages/tasks/task-hentges-x11.bb +++ b/packages/tasks/task-hentges-x11.bb @@ -1,7 +1,8 @@ #! /bin/sh # # Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) # # Filename: task-hentges-x11.bb # Date: 20070522 (YMD) -- cgit v1.2.3 From c2d4f57002933523cebd64df07e3a4384ca6c655 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 24 May 2007 17:34:13 +0000 Subject: packages/libiconv: Battle libiconv to not use a rpath (and fix the uclibc build) -Update libiconv to 1.11 (the latest) -We do not package the LD_PRELOADable libiconv stub -Try hard to disable the rpath issue and. --disable-rpath doesn't disable the roath --disable-rpath=no (wasn't tested and if it works....) --enable-relocatable says to imply --disable-rpath but that doesn't work. Also the files can't be regenerated as the Makefile.am doesn't exist and people patch the Makefile.in. As a last resort fail back to some GNU sed to patch *-libtool to make sure that hardcoding of rpaths will fail! --- packages/libiconv/libiconv_1.11.bb | 35 +++++++++++++++++++++++++++++++++++ packages/libiconv/libiconv_1.9.2.bb | 28 ---------------------------- 2 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 packages/libiconv/libiconv_1.11.bb delete mode 100644 packages/libiconv/libiconv_1.9.2.bb (limited to 'packages') diff --git a/packages/libiconv/libiconv_1.11.bb b/packages/libiconv/libiconv_1.11.bb new file mode 100644 index 0000000000..de87486a87 --- /dev/null +++ b/packages/libiconv/libiconv_1.11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ +multiple character encodings, but that support lacks from your system." +HOMEPAGE = "http://www.gnu.org/software/libiconv" +SECTION = "libs" +PRIORITY = "optional" +NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" +PROVIDES = "virtual/libiconv" +PR = "r4" +LICENSE = "LGPL" +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz" + +S = "${WORKDIR}/libiconv-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" + +do_configure () { + rm -f m4/libtool.m4 libcharset/m4/libtool.m4 + autotools_do_configure + + # As we do not really regenerate the Makefiles... and they have stale deps to this file + touch m4/libtool.m4 + + # Fix stupid libtool... handling. rpath handling can't be disabled and the Makefile's can't be regenerated.. + # (GNU sed required) + sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool +} + +do_stage () { + oe_libinstall -so -a -C lib libiconv ${STAGING_LIBDIR} + oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR} + oe_libinstall -so -a -C libcharset/lib libcharset ${STAGING_LIBDIR} + autotools_stage_includes +} diff --git a/packages/libiconv/libiconv_1.9.2.bb b/packages/libiconv/libiconv_1.9.2.bb deleted file mode 100644 index 059d5fd4c5..0000000000 --- a/packages/libiconv/libiconv_1.9.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ -multiple character encodings, but that support lacks from your system." -HOMEPAGE = "http://www.gnu.org/software/libiconv" -SECTION = "libs" -PRIORITY = "optional" -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -PROVIDES = "virtual/libiconv" -PR = "r4" -LICENSE = "LGPL" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz" - -S = "${WORKDIR}/libiconv-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--enable-shared --enable-static" - -do_configure () { - rm -f m4/libtool.m4 libcharset/m4/libtool.m4 - autotools_do_configure -} - -do_stage () { - oe_libinstall -so -a -C lib libiconv ${STAGING_LIBDIR} - oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR} - oe_libinstall -so -a -C libcharset/lib libcharset ${STAGING_LIBDIR} - autotools_stage_includes -} -- cgit v1.2.3 From b5b4e05056a1495d9b0d55a9d3e3316bfe747b56 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 24 May 2007 19:39:05 +0000 Subject: packages/meta/oplinux-packages.bb : Fix "identation error" when used with bitbake 1.8 (thanks to zecke for the info) Varius typos fixed --- packages/meta/oplinux-packages.bb | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb index dcbbea9f95..62513c11cd 100644 --- a/packages/meta/oplinux-packages.bb +++ b/packages/meta/oplinux-packages.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Packages that are compatible with the OPLinux distro" HOMEPAGE = "http://www.digital-opsis/oplinux" LICENSE = "MIT" -PR = "r0" +PR = "r1" PROVIDES += "${OPLINUX_IMAGENAME}-packages" EXCLUDE_FROM_WORLD = "1" @@ -16,37 +16,38 @@ python __anonymous () { import bb -#Get all the packages we can build/exist in OE + #Get all the packages we can build/exist in OE package_list = bb.data.getVar('PACKAGES_LIST', d) or "none" - package_list = package_list.split() - -#Get the packages that are broken on all architectures + package_list=package_list.split() + + #Get the packages that are broken on all architectures broken_package_list = bb.data.expand('${OPLINUX_BROKEN_PACKAGES}', d) -#Get the arch we are building for + # Get the arch we are building for building_arch = bb.data.getVar('FEED_ARCH',d) -#Now add the broken packages list the ones that fail for the arch we build now + #Now add the broken packages list the ones that fail for the arch we build now if (building_arch=="i486") or (building_arch=="i586") or (building_arch=="i686"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x8}', d) + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x86}', d) elif (building_arch=="ppc405"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d) + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d) elif (building_arch=="ppc603e"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d) + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d) + for chk_package in package_list : build_package="yes" - - if chk_package in broken_package_list: - build_package="no" - else : - bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d) + if chk_package in broken_package_list: + build_package="no" + else : + bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d) #add the OPLinux extra packages to the DEPENDS list bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + bb.data.getVar('OPLINUX_EXTRA_PACKAGES', d)), d) + bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + "package-index"), d) } @@ -453,7 +454,7 @@ OPLINUX_BROKEN_PACKAGES_ARCH_x86 =" \ " # #ppc405 -OPLINUX_BROKEN_PACKAGES_ARC_PPC = " \ +OPLINUX_BROKEN_PACKAGES_ARCH_PPC = " \ aircrack \ appweb \ apt \ -- cgit v1.2.3 From b5f560ae6f8a42505727dbe8367465a156d78849 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 25 May 2007 06:42:17 +0000 Subject: linux-handhelds-2.6: Update defconfigs from defconfigman r258 * Also includes support for h2200 and htcblueangel. --- .../linux/linux-handhelds-2.6/h2200/.mtn2git_empty | 0 packages/linux/linux-handhelds-2.6/h3900/defconfig | 100 ++++-- packages/linux/linux-handhelds-2.6/h4000/defconfig | 45 ++- packages/linux/linux-handhelds-2.6/h5000/defconfig | 104 ++++-- .../htcblueangel/.mtn2git_empty | 0 .../linux-handhelds-2.6/htcuniversal/defconfig | 45 ++- .../linux/linux-handhelds-2.6/hx4700/defconfig | 45 ++- .../linux/linux-handhelds-2.6/magician/defconfig | 379 +++++++++++++++++---- 8 files changed, 521 insertions(+), 197 deletions(-) create mode 100644 packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty create mode 100644 packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 297be698cb..57ee273c91 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make c