diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install index 907dd734dd..a599857b56 100755 --- a/packages/audio/alsa-utils/install +++ b/packages/audio/alsa-utils/install @@ -26,6 +26,7 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin cp $PKG_BUILD/aplay/aplay $INSTALL/usr/bin cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/bin + cp $PKG_BUILD/speaker-test/speaker-test $INSTALL/usr/bin mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/alsactl/alsactl $INSTALL/usr/sbin diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample new file mode 100644 index 0000000000..66751a5c1d --- /dev/null +++ b/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample @@ -0,0 +1,9 @@ +pcm.!default { + type plug + slave { +# pcm "hw:1,0" #delete the first hash for sound over analog +# pcm "hw:1,1" #delete the first hash for sound over optical +# pcm "hw:0,3" #delete the first hash for sound over hdmi + rate 48000 + } +} diff --git a/packages/audio/libsndfile/meta b/packages/audio/libsndfile/meta index b2c835bfa0..bf4b6ab070 100644 --- a/packages/audio/libsndfile/meta +++ b/packages/audio/libsndfile/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libsndfile" -PKG_VERSION="1.0.23" +PKG_VERSION="1.0.25" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/devel/libcap/build b/packages/devel/libcap-ng/build similarity index 74% rename from packages/devel/libcap/build rename to packages/devel/libcap-ng/build index e98284fea5..ff54471dd4 100755 --- a/packages/devel/libcap/build +++ b/packages/devel/libcap-ng/build @@ -24,15 +24,19 @@ . config/options $1 cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --disable-static \ + --enable-shared \ + --with-gnu-ld \ + --without-debug \ + --with-warn \ + --without-python -sed -i -e "/^PAM_CAP/s:=.*:=no:" Make.Rules +make -setup_toolchain host - -make CC=$HOST_CC -C libcap _makenames - -setup_toolchain target - -make CC=$TARGET_CC - -$MAKEINSTALL -j1 RAISE_SETFCAP=no +$MAKEINSTALL diff --git a/packages/devel/libcap/install b/packages/devel/libcap-ng/install similarity index 95% rename from packages/devel/libcap/install rename to packages/devel/libcap-ng/install index 3f075cb86c..4d14480164 100755 --- a/packages/devel/libcap/install +++ b/packages/devel/libcap-ng/install @@ -24,4 +24,4 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libcap/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/devel/libcap/meta b/packages/devel/libcap-ng/meta similarity index 88% rename from packages/devel/libcap/meta rename to packages/devel/libcap-ng/meta index e6ba0f6a98..0e08fcc904 100644 --- a/packages/devel/libcap/meta +++ b/packages/devel/libcap-ng/meta @@ -19,17 +19,17 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="libcap" -PKG_VERSION="2.20" +PKG_NAME="libcap-ng" +PKG_VERSION="0.6.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="" -PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://people.redhat.com/sgrubb/libcap-ng/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="attr" PKG_BUILD_DEPENDS="toolchain attr" PKG_PRIORITY="optional" PKG_SECTION="devel" -PKG_SHORTDESC="libcap: A library for getting and setting POSIX.1e capabilities" +PKG_SHORTDESC="libcap-ng: A library for getting and setting POSIX.1e capabilities" PKG_LONGDESC="As of Linux 2.2.0, the power of the superuser has been partitioned into a set of discrete capabilities (in other places, these capabilities are know as privileges). The contents of the libcap package are a library and a number of simple programs that are intended to show how an application/daemon can be protected (with wrappers) or rewritten to take advantage of this fine grained approach to constraining the danger to your system from programs running as 'root'." PKG_IS_ADDON="no" diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 43b73709d0..167fd28cc3 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="7.11-rc3" +PKG_VERSION="7.11-rc4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/graphics/Mesa/patches/Mesa-7.11-rc3-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-7.11-rc4-llvm_so.patch similarity index 100% rename from packages/graphics/Mesa/patches/Mesa-7.11-rc3-llvm_so.patch rename to packages/graphics/Mesa/patches/Mesa-7.11-rc4-llvm_so.patch diff --git a/packages/graphics/libjpeg-turbo/meta b/packages/graphics/libjpeg-turbo/meta index c1fd149641..9d70d1b8ff 100644 --- a/packages/graphics/libjpeg-turbo/meta +++ b/packages/graphics/libjpeg-turbo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libjpeg-turbo" -PKG_VERSION="1.1.0" +PKG_VERSION="1.1.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/scripts/gputemp b/packages/mediacenter/xbmc/scripts/gputemp index 3c39bc5f73..7ce4fce138 100755 --- a/packages/mediacenter/xbmc/scripts/gputemp +++ b/packages/mediacenter/xbmc/scripts/gputemp @@ -26,4 +26,8 @@ if lspci -n | grep 0300 | grep -q 10de; then [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'` fi +if lspci -n | grep 0300 | grep -q 1002; then + [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"` +fi + echo "${TEMP} C" diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta index 16c393ac05..2834f38239 100644 --- a/packages/multimedia/libva/meta +++ b/packages/multimedia/libva/meta @@ -19,13 +19,12 @@ ################################################################################ PKG_NAME="libva" -PKG_VERSION="270299f" +PKG_VERSION="1.0.14" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/vaapi" -#PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa" PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa" PKG_PRIORITY="optional" diff --git a/packages/network/cifs-utils/build b/packages/network/cifs-utils/build index 45000a9a45..ff05151ad8 100755 --- a/packages/network/cifs-utils/build +++ b/packages/network/cifs-utils/build @@ -24,6 +24,7 @@ cd $PKG_BUILD ac_cv_func_malloc_0_nonnull=yes \ +ac_cv_func_realloc_0_nonnull=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -32,6 +33,8 @@ ac_cv_func_malloc_0_nonnull=yes \ --localstatedir=/var \ --disable-cifsupcall \ --disable-cifscreds \ + --disable-cifsidmap \ + --with-libcap-ng \ --with-libcap \ make diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta index 43847599a0..949b5a8e71 100644 --- a/packages/network/cifs-utils/meta +++ b/packages/network/cifs-utils/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.samba.org" PKG_URL="ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libcap" -PKG_BUILD_DEPENDS="toolchain libcap" +PKG_DEPENDS="libcap-ng" +PKG_BUILD_DEPENDS="toolchain libcap-ng" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="cifs-utils: a set of user-space tools to mount/umount CIFS filesystems" diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 1e7331e5b9..a678a1297f 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -100,16 +100,17 @@ fi echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE [ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE [ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE + fi [ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1" [ -n "$NET_DNS2" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS2" [ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3" [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE - fi + # END OF NETWORK 1 # NETWORK 2: ( LAN / WLAN ) - if [ "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then + if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then # setup Networking 2 progress "setup Networking 2" @@ -160,12 +161,12 @@ fi echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE [ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE [ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE + fi [ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1" [ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2" [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3" [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE - fi ( # wait some time, put eth1 (NET2_IFACE) down and then up @@ -189,7 +190,7 @@ fi progress "starting Connection manager" while true; do - /usr/sbin/connmand -n + /usr/sbin/connmand -n > /dev/null 2>&1 usleep 250000 done )& diff --git a/packages/network/connman/scripts/cmcc b/packages/network/connman/scripts/cmcc index 00a58df037..fba39fced2 100755 --- a/packages/network/connman/scripts/cmcc +++ b/packages/network/connman/scripts/cmcc @@ -77,12 +77,14 @@ def usage(name): print " wpas list" print " wpas networks" print " wpas bss" + print " technologies" print "" print "Properties:" print " apn " print " passphrase " print " autoconnect " print " ipv4 " + print " ipv6 " print " nameservers auto | [nameserver] [nameserver]" print " domains [domain] [domain] ..." @@ -161,9 +163,7 @@ def get_service_name(path): def extract_dict(values): s = "" for k, v in values.items(): - if type(v) is dbus.Array: - v = extract_list(v) - s += " %s=%s" % (k,v) + s += " %s=%s" % (k, convert_dbus_value(v)) return "{ %s }" % s def extract_list(values): @@ -188,27 +188,6 @@ def convert_dbus_value(value): return result -def get_devices(): - bus = get_bus() - manager = get_manager() - - result = [] - - properties = manager.GetProperties() - for path in properties["Technologies"]: - technology = dbus.Interface(bus.get_object("net.connman", - path), - "net.connman.Technology") - properties = technology.GetProperties() - - for path in properties["Devices"]: - d = dbus.Interface(bus.get_object("net.connman", - path), - "net.connman.Device") - result.append(d) - - return result - def cmd_state(): manager = get_manager() properties = manager.GetProperties() @@ -218,18 +197,20 @@ def cmd_state(): "Providers", "EnabledDebugs", "AvailableDebugs", "Technologies", "Services"] + print "[ / ]" + keys = properties.keys() for key in order: if key in keys: keys.remove(key) value = convert_dbus_value(properties[key]) - print "%s: %s" % (key, value) + print " %s = %s" % (key, value) # print properties missing in the order for key in keys: value = convert_dbus_value(properties[key]) - print "%s: %s" % (key, value) + print " %s = %s" % (key, value) def cmd_services(): bus = get_bus() @@ -295,6 +276,34 @@ def cmd_edit_autoconnect(service, argv): print autoconnect service.SetProperty("AutoConnect", autoconnect); +def cmd_edit_ipv6(service, argv): + if len(argv) < 1: + raise ArgumentException("ipv6 method missing") + + method = argv.pop(0) + + if method == "auto": + value = { "Method": "auto" } + elif method == "off": + value = { "Method": "off" } + elif method == "manual": + if len(argv) < 3: + raise ArgumentException("invalid syntax for ipv6 " + "manual configuration") + + address = argv.pop(0) + prefix = argv.pop(0) + gateway = argv.pop(0) + + value = { "Method": "manual", + "Address": address, + "PrefixLength": prefix, + "Gateway": gateway } + else: + raise ArgumentException("Unknown ipv6 method: " + method) + + service.SetProperty("IPv6.Configuration", value); + def cmd_edit_ipv4(service, argv): if len(argv) < 1: raise ArgumentException("ipv4 method missing") @@ -316,6 +325,9 @@ def cmd_edit_ipv4(service, argv): "Address": address, "Netmask": netmask, "Gateway": gateway } + else: + raise ArgumentException("Unknown ipv4 method: " + method) + service.SetProperty("IPv4.Configuration", value); @@ -360,10 +372,15 @@ def cmd_edit(argv): cmd_edit_autoconnect(service, argv) elif prop in ["ipv4"]: cmd_edit_ipv4(service, argv) + elif prop in ["ipv6"]: + cmd_edit_ipv6(service, argv) elif prop in ["nameservers"]: cmd_edit_nameservers(service, argv) elif prop in ["domains"]: cmd_edit_domains(service, argv) + else: + raise ArgumentException("unknown property: %s" % prop) + def cmd_connect(argv): @@ -415,32 +432,9 @@ def cmd_scan(argv): manager = get_manager() manager.RequestScan(arg) - devices = get_devices() - - if len(devices) == 0: - # no devices available so no scan results either - return - - # start waiting for scanning to end, but take into account - # that not all devices, if any (!), support scanning - scanning = False - scan_supported = False - - while True: - scanning = False - for device in devices: - properties = device.GetProperties() - - if "Scanning" not in properties: - continue - - scan_supported = True - - if properties["Scanning"]: - scanning = True - - if not scanning or not scan_supported: - break; + # there's no way to know when scan has ended, so just wait and + # hope for best + time.sleep(10) cmd_services() @@ -874,6 +868,25 @@ def cmd_connect_hidden(argv): except dbus.DBusException, error: print "%s: %s" % (error._dbus_error_name, error.message) +def cmd_technologies(argv): + bus = get_bus() + manager = get_manager() + + result = [] + + properties = manager.GetProperties() + for path in properties["Technologies"]: + technology = dbus.Interface(bus.get_object("net.connman", + path), + "net.connman.Technology") + props = technology.GetProperties() + + print "[ %s ]" % path + + for key in props.keys(): + value = convert_dbus_value(props[key]) + print " %s = %s" % (key, value) + def handle_cmd(cmd, argv, name): if cmd == "help": usage(name) @@ -907,6 +920,8 @@ def handle_cmd(cmd, argv, name): cmd_wpas(argv) elif cmd == "connect-hidden": cmd_connect_hidden(argv) + elif cmd in ["technologies", "tech"]: + cmd_technologies(argv) else: print "Unknown command" diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample index bef300ea64..6190c959e7 100644 --- a/packages/network/netmount/config/netmount.conf.sample +++ b/packages/network/netmount/config/netmount.conf.sample @@ -32,12 +32,19 @@ # "afp" for AFP (Apple File Protocol) mounts # - Please use an "|" as delimiter # - Don't use spaces in usernames, passwords and options -# - for NFS mounts there is no support for options -# - be aware of the different syntax for NFS and AFP mount +# - be aware of the different syntax for NFS and AFP mounts # - Local mountpoints should only be on /storage # # Examples: +# AFP (Apple File Protocol) mounts, please specify username and password if +# needed. # afp | 192.168.1.44/videos | /storage/mount/videos | : + +# CIFS (Samba/ Windows share) mounts, please specify username and password if +# needed (comma seperated). # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret # cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret -# nfs | 192.168.1.44:/videos | /storage/mount/videos | ro,tcp,timeo=600 + +# NFS (Network File System) mounts, please specify additional options if needed +# (comma seperated). Default options are 'tcp' and 'nolock'. +# nfs | 192.168.1.44:/videos | /storage/mount/videos | ro,timeo=600 diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount index acbb5439c9..3a380f796d 100755 --- a/packages/network/netmount/scripts/netmount +++ b/packages/network/netmount/scripts/netmount @@ -46,7 +46,7 @@ IFS=" mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" & ;; nfs) - mount "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" & + mount "$SHARE" "$MOUNTPOINT" -o nolock,tcp,"$OPTIONS" & ;; esac done diff --git a/packages/print/freetype/meta b/packages/print/freetype/meta index b799da8547..1331f20599 100644 --- a/packages/print/freetype/meta +++ b/packages/print/freetype/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="freetype" -PKG_VERSION="2.4.5" +PKG_VERSION="2.4.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/init.d/04_userconfig b/packages/sysutils/busybox/init.d/04_userconfig index 5ad727d68e..a9dc70dd55 100644 --- a/packages/sysutils/busybox/init.d/04_userconfig +++ b/packages/sysutils/busybox/init.d/04_userconfig @@ -33,9 +33,13 @@ if [ -d /usr/config ]; then mkdir -p /storage/.config/$dir done - for file in `find . -type f`; do - if [ ! -f /storage/.config/$file ]; then - cp $file /storage/.config/$file + for config in `find . -type f -name "*.conf"`; do + if [ ! -f /storage/.config/$config ]; then + cp $config /storage/.config/$config fi done + + for sample in `find . -type f -name "*.sample"`; do + cp $sample /storage/.config/$sample + done fi diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 1f1db9626f..98965e03b2 100755 --- a/packages/x11/driver/xf86-video-fglrx/install +++ b/packages/x11/driver/xf86-video-fglrx/install @@ -85,6 +85,10 @@ mkdir -p $INSTALL/usr/lib cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib +# ATI config +mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/bin/aticonfig $INSTALL/usr/bin + if [ "$VAAPI" = yes ]; then $SCRIPTS/install xvba-video diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/meta index 81044e0de4..0472dc03d7 100644 --- a/packages/x11/lib/libX11/meta +++ b/packages/x11/lib/libX11/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libX11" -PKG_VERSION="1.4.3" +PKG_VERSION="1.4.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS"