Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

2025-07-24 11:16:51 +00:00 · 2011-06-25 14:07:27 +02:00 · 2011-06-25 14:07:27 +02:00 · 795d7b82eb
commit 795d7b82eb
parent 20ce69f3c8 64abe69804
18 changed files with 40 additions and 36 deletions
--- a/packages/devel/ncurses/build
+++ b/packages/devel/ncurses/build
@ -27,12 +27,14 @@ CWD=`pwd`
 setup_toolchain host

 cd $PKG_BUILD/ncurses-host
-./configure
+./configure --prefix=$ROOT/$TOOLCHAIN \
+            --with-shared \

 make -C include
 make -C progs tic

 cp progs/tic $ROOT/$TOOLCHAIN/bin
+cp lib/*.so* $ROOT/$TOOLCHAIN/lib

 cd "$CWD"

--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@ -40,10 +40,10 @@ LDFLAGS="$LDFLAGS -lexpat" \
             --enable-unicode=ucs4 \

 make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
-     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib"
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64"

 make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
-     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64" \
     install

 # symlink python binary to python2 (needed for Mesa)
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/packages/linux-firmware/wlan-firmware/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.3"
+PKG_VERSION="0.0.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
--- a/packages/web/curl/meta
+++ b/packages/web/curl/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="curl"
-PKG_VERSION="7.21.6"
+PKG_VERSION="7.21.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
--- a/packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch
+++ b/packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@ -2244,8 +2244,9 @@ CONFIG_STAGING=y
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_R8187SE is not set
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -118,10 +118,9 @@

 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@ -2429,8 +2429,9 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -118,10 +118,9 @@

 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@ -2674,9 +2674,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -118,10 +118,9 @@

 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@ -2519,9 +2519,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@ -2455,9 +2455,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/ION/options
+++ b/projects/ION/options
@ -118,10 +118,9 @@

 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@ -2566,9 +2566,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@ -2507,9 +2507,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -118,10 +118,9 @@

 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/scripts/checkdeps
+++ b/scripts/checkdeps
@ -35,8 +35,8 @@ case $1 in
  build)
    deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
    deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
-    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h"
-    files_pkg="glibc-static libc6-dev libncurses5-dev"
+    files="/usr/include/stdio.h /usr/include/ncurses.h"
+    files_pkg="libc6-dev libncurses5-dev"
    ;;
  qemu)
    if [ ! `which qemu` ]; then