summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc19
-rw-r--r--packages/bash/bash.inc11
-rw-r--r--packages/bash/bash_3.0.bb9
-rw-r--r--packages/bash/bash_3.2.bb6
-rw-r--r--packages/bash/files/.mtn2git_empty0
-rw-r--r--packages/bash/files/builtins.patch13
-rw-r--r--packages/gstreamer/gst-plugin-pulse_0.9.4.bb28
7 files changed, 41 insertions, 45 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 0c6b63ec04..b86a6f90bb 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -59,7 +59,7 @@ PREFERRED_VERSION_autofs ?= "4.1.4"
PREFERRED_VERSION_automake ?= "1.9.6"
PREFERRED_VERSION_automake-native ?= "1.9.6"
PREFERRED_VERSION_avahi ?= "0.6.22"
-PREFERRED_VERSION_avahi-python ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
PREFERRED_VERSION_avahi-ui ?= "0.6.22"
PREFERRED_VERSION_avetanabt ?= "20060413"
PREFERRED_VERSION_bacula-client ?= "1.38.11"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0"
PREFERRED_VERSION_btsco ?= "0.42"
PREFERRED_VERSION_btsco-module ?= "0.42"
PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox-static ?= "1.2.1"
PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
@@ -201,8 +201,8 @@ PREFERRED_VERSION_ctorrent ?= "1.3.4"
PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.16.4"
-PREFERRED_VERSION_curl-native ?= "7.16.4"
+PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.0"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -221,6 +221,7 @@ PREFERRED_VERSION_dbench ?= "4.0"
PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_dbus-native ?= "1.0.3"
@@ -606,7 +607,7 @@ PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
PREFERRED_VERSION_gspcav1 ?= "20070110"
PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2"
PREFERRED_VERSION_gst-meta-base ?= "0.10"
-PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.4"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
PREFERRED_VERSION_gst-plugins-base ?= "0.10.17"
PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
@@ -1296,7 +1297,7 @@ PREFERRED_VERSION_mythfront-config ?= "1.10"
PREFERRED_VERSION_mythfront-session ?= "1.5"
PREFERRED_VERSION_nabi ?= "0.17"
PREFERRED_VERSION_nail ?= "11.21"
-PREFERRED_VERSION_nano ?= "2.0.6"
+PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
@@ -1499,7 +1500,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6.0"
PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
-PREFERRED_VERSION_python-gst ?= "0.10.8"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
PREFERRED_VERSION_python-hmm ?= "0.4"
PREFERRED_VERSION_python-imaging ?= "1.1.6"
PREFERRED_VERSION_python-imdbpy ?= "3.1"
@@ -1958,9 +1959,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
PREFERRED_VERSION_wmctrl ?= "1.07"
PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
-PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
-PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.10"
PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
PREFERRED_VERSION_wrt-init ?= "1.0"
PREFERRED_VERSION_wrt-utils ?= "1.0"
diff --git a/packages/bash/bash.inc b/packages/bash/bash.inc
index b67e8bbe39..4eba6895ba 100644
--- a/packages/bash/bash.inc
+++ b/packages/bash/bash.inc
@@ -8,17 +8,26 @@ inherit autotools gettext
PARALLEL_MAKE = ""
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz"
+S = "${WORKDIR}/bash-${PV}"
+
bindir = "/bin"
sbindir = "/sbin"
EXTRA_OECONF = "--with-ncurses"
-export CC_FOR_BUILD = "${BUILD_CC}"
do_configure () {
gnu-configize
oe_runconf
}
+do_compile_prepend() {
+ cd builtins
+ touch mkbuiltins.o
+ ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${S}/include -I${S} -o mkbuiltins mkbuiltins.c
+ cd ${S}
+}
+
pkg_postinst () {
touch $D${sysconfdir}/shells
grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb
index babb70493e..a3aa25dee5 100644
--- a/packages/bash/bash_3.0.bb
+++ b/packages/bash/bash_3.0.bb
@@ -1,6 +1,7 @@
require bash.inc
-PR = "r9"
+PR = "r10"
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
- file://bash-3.0-fixes.patch;patch=1 \
- file://signames-mipsel.diff;patch=1"
+SRC_URI += "\
+ file://bash-3.0-fixes.patch;patch=1 \
+ file://signames-mipsel.diff;patch=1 \
+"
diff --git a/packages/bash/bash_3.2.bb b/packages/bash/bash_3.2.bb
index 883df50194..568f8206f5 100644
--- a/packages/bash/bash_3.2.bb
+++ b/packages/bash/bash_3.2.bb
@@ -1,7 +1,9 @@
require bash.inc
-PR = "r4"
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+PR = "r5"
+
+SRC_URI += "\
+ file://builtins.patch;patch=1 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0 \
diff --git a/packages/bash/files/.mtn2git_empty b/packages/bash/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bash/files/.mtn2git_empty
diff --git a/packages/bash/files/builtins.patch b/packages/bash/files/builtins.patch
new file mode 100644
index 0000000000..d6881ac8a3
--- /dev/null
+++ b/packages/bash/files/builtins.patch
@@ -0,0 +1,13 @@
+Index: bash-3.2/builtins/Makefile.in
+===================================================================
+--- bash-3.2.orig/builtins/Makefile.in
++++ bash-3.2/builtins/Makefile.in
+@@ -189,7 +189,7 @@ install: @HELPINSTALL@
+
+ mkbuiltins.o: ../config.h
+ mkbuiltins.o: mkbuiltins.c
+- $(RM) $@
++ echo $(RM) $@
+ $(CC_FOR_BUILD) -c $(CCFLAGS_FOR_BUILD) $<
+
+ mkbuiltins$(EXEEXT): mkbuiltins.o
diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.4.bb b/packages/gstreamer/gst-plugin-pulse_0.9.4.bb
deleted file mode 100644
index a91e482358..0000000000
--- a/packages/gstreamer/gst-plugin-pulse_0.9.4.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
-HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
-LICENSE = "GPL"
-DEPENDS = "gstreamer pulseaudio"
-PR = "r1"
-
-SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz"
-S = "${WORKDIR}/gst-pulse-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-lynx"
-GST_LIBV = 0.10
-
-do_install() {
- install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
- install -m 0755 src/.libs/libgstpulse.so ${D}${libdir}/gstreamer-${GST_LIBV}
-}
-
-export GST_MODDIR=${libdir}/gstreamer-0.10
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/libgstpulse.so"
-FILES_${PN}-dev = "\
- ${libdir}/gstreamer-0.10/libgstpulse.a \
- ${libdir}/gstreamer-0.10/libgstpulse.la \
- ${libdir}/gstreamer-0.10/libgstpulse.so*"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 01:48:21 +0000