config/version: set version to 3.95.5

Signed-off-by: Stephan Raue <stephan@openelec.tv>

CHANGELOG

@@ -1,20 +1,13 @@
-OpenELEC (Version 2.1)
+OpenELEC CHANGELOG
+==================
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
+To view recent changes/commits to the project (master branch) please visit:
 
-Added packages:
+https://github.com/OpenELEC/OpenELEC.tv/commits/master
-  - add package 'ppp'
-  - add package 'pptp'
 
-Package updates:
+To compare commits between versions use a formatted URL like:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
 
-Added functions:
+https://github.com/OpenELEC/OpenELEC.tv/compare/3.2.3...3.2.4
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
 
-Changed functions:
+If you have questions on differences between releases please ask them in the
-
+OpenELEC website forums or IRC support channel.
-Removed functions:

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIRS=build.*
 
-all: system
+all: release
 
 system:
 	./scripts/image

TODO

@@ -6,4 +6,3 @@ irserver:
 
 settings addon:
   - remove ps3 sleep? should be fixed in bluez 5.13/5.14
-  - move LCDd to services

config/path

@@ -193,3 +193,7 @@ BUILD_INDENT_SIZE=4
 
 # multilib? nah
 unset CONFIG_SITE
+
+# meh suse
+unset PYTHONSTARTUP
+unset PYTHONPATH

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="3.95.5"
 
 # OS_VERSION: OS Version
   OS_VERSION="4.0"

packages/3rdparty/multimedia/vdr-dummydevice/package.mk

@@ -0,0 +1,55 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-dummydevice"
+PKG_VERSION="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
+PKG_URL="http://phivdr.dyndns.org/vdr/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr dummydevice plugin"
+PKG_LONGDESC="vdr dummydevice plugin"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+post_make_target() {
+  $STRIP libvdr-*.so*
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

packages/3rdparty/multimedia/vdr-dummydevice/patches/vdr-dummydevice-01_makefile.patch

@@ -0,0 +1,46 @@
+diff --git a/Makefile b/Makefile
+index dc959f1..5cb2315 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -47,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -103,6 +96,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-iptv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="2.1.0"
+PKG_VERSION="2.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 74f8b09..db294fc 100644
+index 48c8b2c..d370f92 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,8 +12,6 @@
@@ -11,7 +11,7 @@ index 74f8b09..db294fc 100644
  # The official name of this plugin.
  # This name will be used in the '-P...' option of VDR to load the plugin.
  # By default the main source file also carries this name.
-@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+@@ -27,24 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
  
  ### The directory environment:
  
@@ -20,6 +20,7 @@ index 74f8b09..db294fc 100644
 -LIBDIR = $(call PKGCFG,libdir)
 -LOCDIR = $(call PKGCFG,locdir)
 -PLGCFG = $(call PKGCFG,plgcfg)
+-RESDIR = $(call PKGCFG,resdir)
 -CFGDIR = $(call PKGCFG,configdir)
 -#
  TMPDIR ?= /tmp
@@ -37,7 +38,7 @@ index 74f8b09..db294fc 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+@@ -65,7 +54,7 @@ LIBS = $(shell curl-config --libs)
  
  ### Includes and Defines (add further entries here):
  
@@ -46,7 +47,7 @@ index 74f8b09..db294fc 100644
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+@@ -139,6 +128,7 @@ install-i18n: $(I18Nmsgs)
  
  $(SOFILE): $(OBJS)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@

packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="a3b4a5a"
+PKG_VERSION="bf11f9e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch

@@ -1,8 +1,12 @@
 diff --git a/Makefile b/Makefile
-index a49dda6..873e73d 100644
+index efd124a..ed303fa 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -16,18 +16,11 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+@@ -12,22 +12,14 @@ PLUGIN = dvbapi
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+-GITTAG  = $(shell git describe --always 2>/dev/null)
  
  ### The directory environment:
  
@@ -22,7 +26,7 @@ index a49dda6..873e73d 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -35,7 +28,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+@@ -35,7 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
  
  ### The version number of VDR's plugin API:
  
@@ -31,7 +35,7 @@ index a49dda6..873e73d 100644
  
  ### The name of the distribution archive:
  
-@@ -48,7 +41,7 @@ SOFILE = libvdr-$(PLUGIN).so
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
  
  ### Includes and Defines (add further entries here):
  
@@ -40,7 +44,7 @@ index a49dda6..873e73d 100644
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -122,6 +115,7 @@ install-i18n: $(I18Nmsgs)
+@@ -122,6 +114,7 @@ install-i18n: $(I18Nmsgs)
  
  $(SOFILE): $(OBJS) $(FFDECSA)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@

packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk

@@ -16,35 +16,27 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-sc"
+PKG_NAME="vdr-plugin-eepg"
-PKG_VERSION="620"
+PKG_VERSION="69b47ba"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://85.17.209.13:6100/"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr openssl"
+PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
-PKG_SHORTDESC="TV"
+PKG_SHORTDESC="vdr-plugin-eepg"
-PKG_LONGDESC="TV"
+PKG_LONGDESC="This plugin parses the Extended (2 to 10 day) EPG data which is send by providers on their portal channels. This EEPG data is transmitted in a non-standard format on a non-standard PID."
 
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-pre_make_target() {
-  # dont build parallel
-  MAKEFLAGS=-j1
-}
-
 pre_configure_target() {
-  # vdr-sc fails building with LTO support
-  strip_lto
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
-  export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 }
 
 make_target() {

packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch

@@ -0,0 +1,34 @@
+--- vdr-plugin-eepg-master/Makefile	2014-03-11 15:44:36.675368020 +0000
++++ vdr-plugin-eepg-master/Makefile	2014-03-11 15:51:02.065495474 +0000
+@@ -31,21 +31,16 @@
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -119,6 +114,7 @@
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="e5f02b6"
+PKG_VERSION="a3f7ac5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-01_makefile.patch

@@ -2,15 +2,6 @@ diff --git a/Makefile b/Makefile
 index 8f37c92..94869aa 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -7,7 +7,7 @@
- # This name will be used in the '-P...' option of VDR to load the plugin.
- # By default the main source file also carries this name.
- 
--PLUGIN = vnsiserver5
-+PLUGIN = vnsiserver
- 
- ### The version number of this plugin (taken from the main source file):
- 
 @@ -16,30 +16,18 @@ VERSION = $(shell grep 'static const char \*VERSION *=' vnsi.h | awk '{ print $$
  ### The directory environment:
  

packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="7d6ebb7"
+PKG_VERSION="7f49bfa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-satip/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-satip"
+PKG_VERSION="0.2.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_SOURCE_DIR="satip-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-satip: SAT>IP plugin for VDR"
+PKG_LONGDESC="vdr-satip is a SAT>IP plugin for VDR"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    SATIP_USE_TINYXML=1 \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

packages/3rdparty/multimedia/vdr-satip/patches/vdr-satip-01_makefile.patch

@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index 524338c..0569ebe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,6 @@
+ 
+ # Strip debug symbols?  Set eg. to /bin/true if not
+ 
+-STRIP = strip
+-
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR = $(call PKGCFG,configdir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -139,6 +129,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef SATIP_DEBUG
+ 	@$(STRIP) $@
+ endif

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-01_crosscompiling.patch

@@ -1,12 +0,0 @@
-diff -Naur vdr-sc-603/Makefile vdr-sc-603.patch/Makefile
---- vdr-sc-603/Makefile	2011-12-24 04:02:53.000000000 +0100
-+++ vdr-sc-603.patch/Makefile	2011-12-29 18:57:21.660586103 +0100
-@@ -213,7 +213,7 @@
- 	@cp -p $< $@
- 
- $(FFDECSA) $(FFDECSATEST): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
--	@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
-+	@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
- 
- $(I18Npot): $(shell grep -rl '\(tr\|trNOOP\)(\".*\")' *.c $(SYSDIR))
- 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<noone@nowhere.org>' -o $@ `ls $^`

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-02_vdr-2.1.3.patch

@@ -1,31 +0,0 @@
-diff --git a/device.c b/device.c
-index 04bbef1..e6d63aa 100644
---- a/device.c
-+++ b/device.c
-@@ -357,7 +357,7 @@ bool cScDevices::Initialize(void)
-   *vdr_nci=0; *vdr_ud=vdr_save_ud;
- 
-   int i, found=0;
--  for(i=0; i<MAXDVBDEVICES; i++) {
-+  for(i=0; i<MAXDEVICES; i++) {
-     if(UseDevice(NextCardIndex())) {
-       char name[128];
-       cScDevices::DvbName(DEV_DVB_FRONTEND,i,0,name,sizeof(name));
-@@ -382,7 +382,7 @@ bool cScDevices::Initialize(void)
-       }
-     else NextCardIndex(1);
-     }
--  NextCardIndex(MAXDVBDEVICES-i);
-+  NextCardIndex(MAXDEVICES-i);
-   if(found>0) PRINTF(L_GEN_INFO,"captured %d video device%s",found,found>1 ? "s" : "");
-   else PRINTF(L_GEN_INFO,"no DVB device captured");
-   return found>0;
-@@ -411,7 +411,7 @@ void cScDevices::Shutdown(void)
- 
- void cScDevices::SetForceBudget(int n)
- {
--   if(n>=0 && n<MAXDVBDEVICES) budget|=(1<<n);
-+   if(n>=0 && n<MAXDEVICES) budget|=(1<<n);
- }
- 
- bool cScDevices::ForceBudget(int n)

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-03_vdr-2.1.4.patch

@@ -1,73 +0,0 @@
-## source: http://overlays.gentoo.org/svn/proj/vdr/vdr-devel/media-plugins/vdr-sc/files/
-
-diff -r 29b7b5f231c8 cam.c
---- a/cam.c	Sat Jul 21 20:51:33 2012 +0200
-+++ b/cam.c	Wed Jan 08 16:47:38 2014 +0400
-@@ -1841,7 +1841,7 @@
-   cScCamSlot(cCam *Cam, const char *DevId, int Slot);
-   void Process(const unsigned char *data, int len);
-   eModuleStatus Status(void);
--  bool Reset(bool log=true);
-+  bool ResetSlot(bool log=true);
-   cCiFrame *Frame(void) { return &frame; }
-   };
- 
-@@ -1853,7 +1853,7 @@
-   cam=Cam; devId=DevId; slot=Slot;
-   version=0; caids[0]=0; doReply=false; lastStatus=msReset;
-   frame.SetRb(&rb);
--  Reset(false);
-+  ResetSlot(false);
- }
- 
- eModuleStatus cScCamSlot::Status(void)
-@@ -1876,7 +1876,7 @@
-   return status;
- }
- 
--bool cScCamSlot::Reset(bool log)
-+bool cScCamSlot::ResetSlot(bool log)
- {
-   reset=true; resetTimer.Set(SLOT_RESET_TIME);
-   rb.Clear();
-@@ -1890,7 +1890,7 @@
-   bool dr=cam->IsSoftCSA(false) || ScSetup.ConcurrentFF>0;
-   if(dr!=doReply && !IsDecrypting()) {
-     PRINTF(L_CORE_CI,"%s.%d: doReply changed, reset triggered",devId,slot);
--    Reset(false);
-+    ResetSlot(false);
-     doReply=dr;
-     }
-   if(checkTimer.TimedOut()) {
-@@ -2330,7 +2330,7 @@
- {
-   cMutexLock lock(&ciMutex);
-   PRINTF(L_CORE_CI,"%s: reset of slot %d requested",devId,Slot);
--  return slots[Slot] ? slots[Slot]->Reset():false;
-+  return slots[Slot] ? slots[Slot]->ResetSlot():false;
- }
- 
- eModuleStatus cCam::ModuleStatus(int Slot)
---- a/device-tmpl.c	2012-07-21 20:51:33.000000000 +0200
-+++ b/device-tmpl.c	2014-01-26 13:51:59.000000000 +0100
-@@ -41,7 +41,6 @@
- #endif //!SASC
- protected:
- #ifndef SASC
--  virtual bool Ready(void);
-   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
-   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-   virtual bool OpenDvr(void);
-@@ -164,12 +163,6 @@
-   return cam || hwciadapter;
- }
- 
--bool SCDEVICE::Ready(void)
--{
--  return (cam         ? cam->Ready():true) &&
--         (hwciadapter ? hwciadapter->Ready():true);
--}
--
- bool SCDEVICE::SetPid(cPidHandle *Handle, int Type, bool On)
- {
-   if(cam) cam->SetPid(Type,Handle->pid,On);

packages/3rdparty/multimedia/vdr/package.mk

@@ -18,7 +18,7 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.1.5"
+PKG_VERSION="2.1.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr/patches/vdr-03_no-locale-support.patch

@@ -1,27 +0,0 @@
-From 092b87b7789206f041de68016fb9a900577a6681 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sun, 13 Oct 2013 20:40:36 +0300
-Subject: [PATCH] no locale support
-
----
- vdr.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/vdr.c b/vdr.c
-index ba59f07..c1b0541 100644
---- a/vdr.c
-+++ b/vdr.c
-@@ -637,10 +637,6 @@ int main(int argc, char *argv[])
-      cCharSetConv::SetSystemCharacterTable(CodeSet);
-      }
- 
--  // Initialize internationalization:
--
--  I18nInitialize(LocaleDirectory);
--
-   // Main program loop variables - need to be here to have them initialized before any EXIT():
- 
-   cEpgDataReader EpgDataReader;
--- 
-1.7.2.5
-

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,5 @@
+4.1.5
+  dont touch /storage/.profile
 4.1.4
   enable hw pid filter by default
 4.1.3

packages/addons/driver/sundtek-mediatv/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="4.1"
-PKG_REV="4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
@@ -49,6 +49,8 @@ make_target() {
   esac
   wget -O installer.tar.gz $INSTALLER_URL
   tar -xzf installer.tar.gz
+  # we run this via wrapper
+  mv opt/bin/mediaclient opt/bin/mediaclient.bin
   chmod 755 opt/bin/*
 }
 

packages/addons/driver/sundtek-mediatv/source/bin/mediaclient

@@ -0,0 +1,2 @@
+#!/bin/sh
+LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so exec mediaclient.bin "$@"

packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh

@@ -73,17 +73,6 @@ mkdir -p /var/config
 cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
 . /var/config/sundtek-addon.conf
 
-# add alias for /opt/bin/mediaclient
-alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)"
-if [ -z "$alias_set" ]; then
-  echo "" >>/storage/.profile
-  echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so" >>/storage/.profile
-  echo "" >>/storage/.profile
-else
-  # fix name
-  sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile
-fi
-
 export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 
 if [ -z "$(pidof mediasrv)" ]; then
@@ -240,7 +229,7 @@ if [ -z "$(pidof mediasrv)" ]; then
   # save adapter serial number in background
   sleep 5
   serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
-  serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}')
+  serial_number_new=$(mediaclient.bin -e | awk '/device / {print $0} /ID:/ {print $2}')
   if [ "$serial_number_old" != "$serial_number_new" ]; then
     echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
   fi

packages/addons/driver/sundtek-mediatv/source/default.py

@@ -25,7 +25,7 @@ __cwd__           = __settings__.getAddonInfo('path')
 __resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
 __settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
+__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient.bin'))
 __ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
 __mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
 

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+4.1.2
+- fix issues with "wait for frontend init". thanks @sraue
+
 4.1.1
 - rebuild to fix curl/gnutls/ssl
 

packages/addons/service/multimedia/tvheadend/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4.27"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -73,10 +73,13 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
 done
 
 # (wait for) at least 1 adapter (xbmc allows to set 0)
+# xbmc allows "numeric" type field to be empty. lets handle thaat
+[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
+# 0 does not make sense. should be 1 or more
 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
 if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
   while [ true ] ; do
-    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
+    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
       break
     fi
     sleep 1

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,21 @@
+4.1.6
+- update to vdr-2.1.6
+- add plugin 'vdr-dummydevice'
+- add plugin 'vdr-satip'
+- remove plugin: 'sc'
+- update to vdr-iptv-2.1.2
+- update to vdr-plugin-xvdr-7f49bfa
+- update to vdr-plugin-vnsiserver-a3f7ac5
+- update to vdr-plugin-dvbapi-bf11f9e
+
+4.1.5
+- fix issues with "wait for frontend init". thanks @sraue
+
+4.1.4
+- add plugin 'vdr-plugin-eepg'
+- update to vdr-plugin-xvdr-4a9d95e
+- update to vdr-plugin-dvbapi-a9b738e
+
 4.1.3
 - update to vdr-2.1.5
 - update to vdr-iptv-2.1.0

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -19,12 +19,12 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="4.1"
-PKG_REV="3"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -46,7 +46,6 @@ addon() {
   VDR_LIVE_DIR="$(get_build_dir vdr-live)"
   VDR_PLUGIN_XVDR_DIR="$(get_build_dir vdr-plugin-xvdr)"
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
-  VDR_SC_DIR="$(get_build_dir vdr-sc)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
 
@@ -76,14 +75,17 @@ addon() {
   cp -PR $(get_build_dir vdr-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $VDR_SC_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $VDR_SC_DIR/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-control)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
   cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
@@ -97,7 +99,7 @@ addon() {
   cp -P $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -PL $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so.11 $ADDON_BUILD/$PKG_ADDON_ID/lib
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -78,7 +78,7 @@ fi
 
 # keep softcam first
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
+  VDR_ARG="$VDR_ARG -P dvbapi"
 fi
 VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
 if [ "$ENABLE_IPTV" == "true" ] ; then
@@ -96,9 +96,18 @@ fi
 if [ "$ENABLE_CONTROL" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
 fi
+if [ "$ENABLE_EEPG" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P eepg"
+fi
 if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P epgsearch"
 fi
+if [ "$ENABLE_DUMMYDEVICE" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P dummydevice"
+fi
+if [ "$ENABLE_SATIP" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P satip"
+fi
 if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'xmltv2vdr --epgfile=$ADDON_CACHE_DIR/epg.db'"
   # xmltv2vdr needs /var/run/vdr
@@ -140,10 +149,13 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
 done
 
 # (wait for) at least 1 adapter (xbmc allows to set 0)
+# xbmc allows "numeric" type field to be empty. lets handle thaat
+[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
+# 0 does not make sense. should be 1 or more
 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
 if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
   while [ true ] ; do
-    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
+    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
       break
     fi
     sleep 1

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -11,20 +11,20 @@
 	<string id="1031">Enable plugin: iptv</string>
 	<string id="1032">Enable plugin: streamdev-client</string>
 	<string id="1033">Enable plugin: streamdev-server</string>
-	<string id="1036">Enable softcam</string>
+	<string id="1036">Enable softcam (dvbapi)</string>
-	<string id="1037">softcam plugin</string>
 	<string id="1038">Enable plugin: live</string>
-	<string id="1039">live: listen on ip</string>
+	<string id="1039">- listen on ip</string>
-	<string id="1040">live: listen on port</string>
+	<string id="1040">- listen on port</string>
 	<string id="1042">Enable plugin: control</string>
-	<string id="1043">control: listen on port</string>
+	<string id="1043">- listen on port</string>
 	<string id="1044">Enable plugin: epgsearch</string>
 	<string id="1045">Enable plugin: xmltv2vdr</string>
+	<string id="1046">Enable plugin: extended EPG</string>
+	<string id="1047">Enable plugin: dummydevice</string>
+	<string id="1048">Enable plugin: satip</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
 	<string id="1053">PVR plugin</string>
-	<string id="1054">Enable dvb(sd|hd)device plugin</string>
-	<string id="1055">plugin</string>
         <string id="1056">Enable external recdmd</string>
         <string id="1057">External recdmd path</string>
 </strings>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -13,7 +13,7 @@
                 <setting id="VDR_VIDEO_DIR" type="folder" label="1052" value="" default="/storage/videos" />
                 <setting type="sep" />
                 <setting id="ENABLE_EXTERNAL_RECCMD" type="bool" label="1056" default="false" />
-                <setting id="EXTERNAL_RECCMD_PATH" type="file" label="1057" enable="!eq(-1,false)" default="" />
+                <setting id="EXTERNAL_RECCMD_PATH" type="file" label="1057" visible="!eq(-1,false)" default="" />
     </category>
     <category label="1001">
 		<setting label="1030" type="lsep"/>
@@ -23,14 +23,16 @@
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
 		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
-		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" enable="!eq(-1,false)" default="0.0.0.0"/>
+		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
-		<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>
+		<setting id="LIVE_PORT" type="number" label="1040" values="" visible="!eq(-2,false)"  default="8008"/>
 		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
-		<setting id="CONTROL_PORT" type="number" label="1043" values="" enable="!eq(-1,false)"  default="2002"/>
+		<setting id="CONTROL_PORT" type="number" label="1043" values="" visible="!eq(-1,false)"  default="2002"/>
+		<setting id="ENABLE_EEPG" type="bool" label="1046" default="false" />
 		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
+		<setting id="ENABLE_DUMMYDEVICE" type="bool" label="1047" default="false" />
+		<setting id="ENABLE_SATIP" type="bool" label="1048" default="false" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
-                <setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc|dvbapi" enable="!eq(-1,false)" default="sc" />
     </category>
 </settings>

packages/addons/service/multimedia/vdr-addon/source/settings-default.xml

@@ -13,9 +13,11 @@
     <setting id="LIVE_PORT" value="8008" />
     <setting id="ENABLE_CONTROL" value="false" />
     <setting id="CONTROL_PORT" value="2002" />
+    <setting id="ENABLE_EEPG" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="ENABLE_XMLTV2VDR" value="false" />
-    <setting id="SOFTCAM_PLUGIN" value="sc" />
+    <setting id="ENABLE_DUMMYDEVICE" value="false" />
+    <setting id="ENABLE_SATIP" value="false" />
     <setting id="ENABLE_EXTERNAL_RECCMD" value="false" />
     <setting id="EXTERNAL_RECCMD_PATH" value="" />
 </settings>

packages/audio/alsa/alsa-utils/package.mk

@@ -46,6 +46,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/lib $INSTALL/var
   rm -rf $INSTALL/usr/share/alsa/speaker-test
   rm -rf $INSTALL/usr/share/sounds
+  rm -rf $INSTALL/usr/lib/systemd/system
 
   for i in aconnect alsaucm amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do
     rm -rf $INSTALL/usr/bin/$i

packages/audio/espeak/package.mk

@@ -0,0 +1,53 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="espeak"
+PKG_VERSION="1.48.04-source"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://espeak.sourceforge.net/"
+PKG_URL="http://downloads.sourceforge.net/$PKG_NAME/$PKG_NAME-$PKG_VERSION.zip"
+PKG_SOURCE_DIR="$PKG_NAME/$PKG_NAME-$PKG_VERSION"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="Text to Speech engine for English, with support for other languages"
+PKG_LONGDESC="Text to Speech engine for English, with support for other languages"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  cp src/portaudio19.h src/portaudio.h
+}
+
+make_target() {
+  make -C src \
+       CXXFLAGS="$CXXFLAGS" \
+       LDFLAGS="$LDFLAGS" \
+       AUDIO=""
+}
+
+makeinstall_target() {
+  make -C src \
+       CXXFLAGS="$CXXFLAGS" \
+       LDFLAGS="$LDFLAGS" \
+       AUDIO="" \
+       DESTDIR=$INSTALL install
+}

packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch

@@ -0,0 +1,23 @@
+diff --git a/src/Makefile b/src/Makefile
+index f04b4c4..b8d4b19 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp
+ 
+ SRCS1=$(speak_SOURCES)
+ OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
+-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
++LIBS1=-lstdc++ -lm $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
+ 
+ SRCS2=$(libespeak_SOURCES)
+ OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
+-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
++LIBS2=-lstdc++ -lm $(LIB_AUDIO) -lpthread
+ 
+ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+-LIBS3=-lstdc++ -L . -lespeak
++LIBS3=-lstdc++ -lm -L . -lespeak
+ 
+ CXXFLAGS=-O2
+ 

packages/audio/espeak/patches/espeak-1.47-wav-close.patch

@@ -0,0 +1,23 @@
+diff --git a/src/espeak.cpp b/src/espeak.cpp
+index 00f93c1..4ad42e8 100644
+--- a/src/espeak.cpp
++++ b/src/espeak.cpp
+@@ -281,10 +281,7 @@ static int SynthCallback(short *wav, int numsamples, espeak_EVENT *events)
+ 	if(quiet) return(0);  // -q quiet mode
+ 
+ 	if(wav == NULL)
+-	{
+-		CloseWavFile();
+ 		return(0);
+-	}
+ 
+ 	while(events->type != 0)
+ 	{
+@@ -805,5 +802,7 @@ int main (int argc, char **argv)
+ 
+ 	if(f_phonemes_out != stdout)
+ 		fclose(f_phonemes_out);  // needed for WinCE
++	CloseWavFile();
++	espeak_Terminate();
+ 	return(0);
+ }

packages/audio/flac/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="flac"
-PKG_VERSION="1.2.1"
+PKG_VERSION="1.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
-PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libogg"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -43,9 +43,15 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
                            --with-ogg=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
-pre_make_target() {
+if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
-  # hack
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse"
-  cp -R ../doc/* ./doc
+else
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
+fi
+
+pre_configure_target() {
+# flac-1.3.0 fails to build with LTO support
+  strip_lto
 }
 
 post_makeinstall_target() {

packages/audio/flac/patches/flac-1.2.1-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
---- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
-+++ flac-1.2.1-new/configure.in	2013-01-03 19:54:10.000000000 -0800
-@@ -44,7 +44,7 @@
- AC_CHECK_SIZEOF(void*,0)
- 
- #@@@ new name is AC_CONFIG_HEADERS
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_C_BIGENDIAN
- 

packages/audio/flac/patches/flac-1.2.1-configure.patch

@@ -1,24 +0,0 @@
-diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
---- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
-+++ flac-1.2.1-new/configure.in	2010-08-17 20:51:01.000000000 -0700
-@@ -21,6 +21,8 @@
- AC_INIT(src/flac/main.c)
- AM_INIT_AUTOMAKE(flac, 1.2.1)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- # Don't automagically regenerate autoconf/automake generated files unless
- # explicitly requested.  Eases autobuilding -mdz
- AM_MAINTAINER_MODE
-diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am
---- flac-1.2.1-old/Makefile.am	2007-09-16 12:29:29.000000000 -0700
-+++ flac-1.2.1-new/Makefile.am	2010-08-17 20:51:27.000000000 -0700
-@@ -30,6 +30,8 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.7
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = doc include m4 man src examples test build obj
- 
- DISTCLEANFILES = libtool-disable-static

packages/audio/flac/patches/flac-1.2.1-cxxflags.patch

@@ -1,17 +0,0 @@
-diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
---- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
-+++ flac-1.2.1-new/configure.in	2010-07-04 17:16:02.000000000 -0700
-@@ -297,11 +297,13 @@
- if test "x$debug" = xtrue; then
- 	CPPFLAGS="-DDEBUG $CPPFLAGS"
- 	CFLAGS="-g $CFLAGS"
-+	CXXFLAGS="-g $CXXFLAGS"
- else
- 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
- 	if test "x$GCC" = xyes; then
- 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
- 		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+		CXXFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CXXFLAGS"
- 	fi
- fi
- 

packages/audio/flac/patches/flac-1.2.1-gcc_4.3.patch

@@ -1,11 +0,0 @@
-diff -Naur flac-1.2.1-old/examples/cpp/encode/file/main.cpp flac-1.2.1-new/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-old/examples/cpp/encode/file/main.cpp	2007-09-13 08:58:03.000000000 -0700
-+++ flac-1.2.1-new/examples/cpp/encode/file/main.cpp	2008-01-08 17:25:20.000000000 -0800
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
- 

packages/audio/libcdio/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libcdio"
-PKG_VERSION="0.90"
+PKG_VERSION="0.92"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/libcdio/patches/libcdio-0.90-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libcdio-0.90-old/configure.ac libcdio-0.90-new/configure.ac
---- libcdio-0.90-old/configure.ac	2012-10-27 08:07:45.000000000 -0700
-+++ libcdio-0.90-new/configure.ac	2012-12-30 14:12:26.000000000 -0800
-@@ -26,7 +26,7 @@
- AM_INIT_AUTOMAKE([foreign])
- 
- AC_CANONICAL_HOST
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- 
- # Enable silent build rules by default (Automake v1.11 or later).

packages/audio/libmodplug/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libmodplug"
-PKG_VERSION="0.8.8.4"
+PKG_VERSION="0.8.8.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/libogg/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libogg"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/audio/libogg/patches/libogg-1.3.0-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libogg-1.3.0-old/configure.in libogg-1.3.0-new/configure.in
---- libogg-1.3.0-old/configure.in	2011-08-04 10:11:08.000000000 -0700
-+++ libogg-1.3.0-new/configure.in	2013-01-03 19:50:49.000000000 -0800
-@@ -19,7 +19,7 @@
- AM_PROG_CC_C_O
- 
- dnl config.h
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl Set some options based on environment
- 

packages/audio/libvorbis/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libvorbis"
-PKG_VERSION="1.3.3"
+PKG_VERSION="1.3.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/audio/libvorbis/patches/libvorbis-1.3.3-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libvorbis-1.3.3-old/configure.ac libvorbis-1.3.3-new/configure.ac
---- libvorbis-1.3.3-old/configure.ac	2012-02-03 14:00:34.000000000 -0800
-+++ libvorbis-1.3.3-new/configure.ac	2013-01-03 20:10:21.000000000 -0800
-@@ -13,7 +13,7 @@
- 
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
- AM_MAINTAINER_MODE
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl Add parameters for aclocal
- AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")

packages/audio/pulseaudio/package.mk

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="pulseaudio"
-PKG_VERSION="4.99.3"
+PKG_VERSION="5.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
-PKG_URL="http://cgit.freedesktop.org/pulseaudio/pulseaudio/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -41,8 +41,6 @@ else
   PULSEAUDIO_BLUETOOTH="--disable-bluez5"
 fi
 
-export GIT_DESCRIBE_FOR_BUILD="4.0"
-
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-nls \

packages/audio/taglib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="taglib"
-PKG_VERSION="1.8"
+PKG_VERSION="1.9.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://taglib.github.com/"
-PKG_URL="https://github.com/downloads/taglib/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/taglib/taglib/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -39,4 +39,5 @@ configure_target() {
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
+  $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
 }

packages/databases/mysql/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.1.70"
+PKG_VERSION="5.1.73"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/databases/mysql/patches/mysql-011_mysql_config-dont-include-LDFLAGS-in-libs-output.patch

@@ -0,0 +1,30 @@
+From 161d55d84441bd3b66eba9eafd85782eeb168cdd Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Fri, 28 Mar 2014 13:12:50 +0200
+Subject: [PATCH] mysql_config: dont include LDFLAGS in --libs output
+
+---
+ scripts/mysql_config.sh |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
+index 7dc9beb..eb188b6 100644
+--- a/scripts/mysql_config.sh
++++ b/scripts/mysql_config.sh
+@@ -105,10 +105,10 @@ fi
+ 
+ # Create options 
+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
++libs=" -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
+-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
++libs_r=" -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
++embedded_libs=" -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+ 
+ if [ -r "$pkglibdir/libmygcc.a" ]; then
+   # When linking against the static library with a different version of GCC
+-- 
+1.7.2.5
+

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080301"
+PKG_VERSION="autoconf-3080403"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/debug/vdpauinfo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdpauinfo"
-PKG_VERSION="0.0.6"
+PKG_VERSION="0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/automake/files/gtk-doc.m4

@@ -1,67 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-  dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH([html-dir],
-    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST([HTML_DIR])
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE([gtk-doc],
-    AS_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [[default=no]]]),,
-    [enable_gtk_doc=no])
-
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-    dnl don't check for glib if we build glib
-    if test "x$PACKAGE_NAME" != "xglib"; then
-      dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-  AC_MSG_RESULT($enable_gtk_doc)
-
-  dnl enable/disable output formats
-  AC_ARG_ENABLE([gtk-doc-html],
-    AS_HELP_STRING([--enable-gtk-doc-html],
-                   [build documentation in html format [[default=yes]]]),,
-    [enable_gtk_doc_html=yes])
-    AC_ARG_ENABLE([gtk-doc-pdf],
-      AS_HELP_STRING([--enable-gtk-doc-pdf],
-                     [build documentation in pdf format [[default=no]]]),,
-      [enable_gtk_doc_pdf=no])
-
-  if test -z "$GTKDOC_MKPDF"; then
-    enable_gtk_doc_pdf=no
-  fi
-
-
-  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])

packages/devel/automake/files/introspection.m4

@@ -1,96 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-	dnl Canonicalize enable_introspection
-	enable_introspection=$found_introspection
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])

packages/devel/automake/package.mk

@@ -36,5 +36,4 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --disable-silent-rules"
 
 post_makeinstall_host() {
   make prefix=$SYSROOT_PREFIX/usr install
-  cp -P $PKG_DIR/files/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
 }

packages/devel/binutils/package.mk

@@ -28,7 +28,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
 PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host gmp:host mpfr:host cloog:host ppl:host"
+PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host gmp:host mpfr:host cloog:host ppl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"

packages/devel/cmake/package.mk

@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_host() {
-  ../configure --no-qt-gui
+  ../configure --no-qt-gui -- -DBUILD_CursesDialog=0
 }
 
 makeinstall_host() {

packages/devel/file/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.16"
+PKG_VERSION="5.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/flex/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="flex"
-PKG_VERSION="2.5.37"
+PKG_VERSION="2.5.39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/gmp/package.mk

@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="gmp"
-PKG_VERSION="5.1.3"
+PKG_VERSION="6.0.0a"
+PKG_SOURCE_DIR="$PKG_NAME-6.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="LGPL"
+PKG_LICENSE="LGPLv3+"
 PKG_SITE="http://gmplib.org/"
-PKG_URL="ftp://ftp.gmplib.org/pub/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"

packages/devel/gmp/patches/gmp-__thumb__-fix-1.patch

@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1396035313 -3600
+# Node ID c56ea318eb6435bdd28dbfef657b2fe372134f1f
+# Parent  c6fe20ab62acc266ff5ad3629bef447bc43dcd1b
+Conditionalise ARM asm on !__thumb__.
+
+diff -r c6fe20ab62ac -r c56ea318eb64 mpn/generic/mod_1_1.c
+--- a/mpn/generic/mod_1_1.c	Wed Mar 26 12:58:33 2014 +0100
++++ b/mpn/generic/mod_1_1.c	Fri Mar 28 20:35:13 2014 +0100
+@@ -129,7 +129,7 @@
+ 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
+ #endif
+ 
+-#if defined (__arm__) && W_TYPE_SIZE == 32
++#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
+ #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+   __asm__ (  "adds	%2, %5, %6\n\t"					\
+ 	     "adcs	%1, %3, %4\n\t"					\
+

packages/devel/gmp/patches/gmp-__thumb__-fix-2.patch

@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1396602422 -7200
+# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
+# Parent  0194a75b56b21a9196626430af86c5bd9110c42d
+Conditionalise ARM asm on !__thumb__.
+
+diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
+--- a/mpn/generic/div_qr_1n_pi1.c	Thu Apr 03 23:58:51 2014 +0200
++++ b/mpn/generic/div_qr_1n_pi1.c	Fri Apr 04 11:07:02 2014 +0200
+@@ -130,7 +130,7 @@
+ 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
+ #endif
+ 
+-#if defined (__arm__) && W_TYPE_SIZE == 32
++#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
+ #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+   __asm__ (  "adds	%2, %5, %6\n\t"					\
+ 	     "adcs	%1, %3, %4\n\t"					\
+

packages/devel/make/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="make"
-PKG_VERSION="3.82"
+PKG_VERSION="4.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/make/patches/make-3.82-012-j8k.patch

@@ -1,26 +0,0 @@
-diff -up make-3.82/main.c\~ make-3.82/main.c
---- make-3.82/main.c~	2010-07-19 09:10:53.000000000 +0200
-+++ make-3.82/main.c	2010-08-11 15:12:09.000000000 +0200
-@@ -1765,6 +1765,20 @@ main (int argc, char **argv, char **envp
-         }
-     }
- 
-+#ifdef PIPE_BUF
-+  if (job_slots > PIPE_BUF)
-+#elif defined _POSIX_PIPE_BUF
-+  if (job_slots > _POSIX_PIPE_BUF)
-+#else
-+  if (job_slots > 512)
-+#endif
-+    {
-+      error (NILF,
-+	     _("More parallel jobs (-jN) than this platform can handle requested."));
-+      error (NILF, _("Resetting to single job (-j1) mode."));
-+      job_slots = 1;
-+    }
-+
-   /* If we have >1 slot but no jobserver-fds, then we're a top-level make.
-      Set up the pipe and install the fds option for our children.  */
- 
-
-Diff finished.  Wed Aug 11 15:12:32 2010

packages/devel/make/patches/make-3.82-013-getcwd.patch

@@ -1,14 +0,0 @@
-diff -up make-3.82/make.h\~ make-3.82/make.h
---- make-3.82/make.h~	2010-07-20 15:12:06.000000000 +0200
-+++ make-3.82/make.h	2010-08-11 15:19:09.000000000 +0200
-@@ -472,7 +472,7 @@ long int lseek ();
- #endif  /* Not GNU C library or POSIX.  */
- 
- #ifdef  HAVE_GETCWD
--# if !defined(VMS) && !defined(__DECC)
-+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
- char *getcwd ();
- # endif
- #else
-
-Diff finished.  Wed Aug 11 15:19:12 2010

packages/devel/make/patches/make-3.82-014-err-reporting.patch

@@ -1,157 +0,0 @@
-diff -urp make-3.82/misc.c make-3.82-pm/misc.c
---- make-3.82/misc.c	2010-07-19 09:10:54.000000000 +0200
-+++ make-3.82-pm/misc.c	2010-08-11 15:26:45.000000000 +0200
-@@ -342,17 +342,31 @@ strerror (int errnum)
- /* Print an error message from errno.  */
- 
- void
-+perror_with_name_err (const char *str, const char *name, int errnum)
-+{
-+  error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
-+}
-+
-+void
- perror_with_name (const char *str, const char *name)
- {
--  error (NILF, _("%s%s: %s"), str, name, strerror (errno));
-+  perror_with_name_err (str, name, errno);
- }
- 
- /* Print an error message from errno and exit.  */
- 
- void
-+pfatal_with_name_err (const char *name, int errnum)
-+{
-+  fatal (NILF, _("%s: %s"), name, strerror (errnum));
-+
-+  /* NOTREACHED */
-+}
-+
-+void
- pfatal_with_name (const char *name)
- {
--  fatal (NILF, _("%s: %s"), name, strerror (errno));
-+  pfatal_with_name_err (name, errno);
- 
-   /* NOTREACHED */
- }
-diff -urp make-3.82/main.c make-3.82-pm/main.c
---- make-3.82/main.c	2010-08-11 15:34:12.000000000 +0200
-+++ make-3.82-pm/main.c	2010-08-11 15:30:11.000000000 +0200
-@@ -1536,13 +1536,13 @@ main (int argc, char **argv, char **envp
- 	    strcat (template, DEFAULT_TMPFILE);
- 	    outfile = open_tmpfile (&stdin_nm, template);
- 	    if (outfile == 0)
--	      pfatal_with_name (_("fopen (temporary file)"));
-+	      pfatal_with_name_err (_("fopen (temporary file)"), errno);
- 	    while (!feof (stdin) && ! ferror (stdin))
- 	      {
- 		char buf[2048];
- 		unsigned int n = fread (buf, 1, sizeof (buf), stdin);
- 		if (n > 0 && fwrite (buf, 1, n, outfile) != n)
--		  pfatal_with_name (_("fwrite (temporary file)"));
-+		  pfatal_with_name_err (_("fwrite (temporary file)"), errno);
- 	      }
- 	    fclose (outfile);
- 
-@@ -1747,7 +1747,7 @@ main (int argc, char **argv, char **envp
-       else if ((job_rfd = dup (job_fds[0])) < 0)
-         {
-           if (errno != EBADF)
--            pfatal_with_name (_("dup jobserver"));
-+            pfatal_with_name_err (_("dup jobserver"), errno);
- 
-           error (NILF,
-                  _("warning: jobserver unavailable: using -j1.  Add `+' to parent make rule."));
-@@ -1788,7 +1788,7 @@ main (int argc, char **argv, char **envp
-       char c = '+';
- 
-       if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
--	pfatal_with_name (_("creating jobs pipe"));
-+	pfatal_with_name_err (_("creating jobs pipe"), errno);
- 
-       /* Every make assumes that it always has one job it can run.  For the
-          submakes it's the token they were given by their parent.  For the
-@@ -1803,7 +1803,7 @@ main (int argc, char **argv, char **envp
- 
-           EINTRLOOP (r, write (job_fds[1], &c, 1));
-           if (r != 1)
--            pfatal_with_name (_("init jobserver pipe"));
-+            pfatal_with_name_err (_("init jobserver pipe"), errno);
-         }
- 
-       /* Fill in the jobserver_fds struct for our children.  */
-@@ -2226,7 +2226,7 @@ main (int argc, char **argv, char **envp
-   /* If there is a temp file from reading a makefile from stdin, get rid of
-      it now.  */
-   if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
--    perror_with_name (_("unlink (temporary file): "), stdin_nm);
-+    perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno);
- 
-   /* If there were no command-line goals, use the default.  */
-   if (goals == 0)
-Только в make-3.82-pm: job.c~
-Только в make-3.82-pm: main.c~
-diff -urp make-3.82/make.h make-3.82-pm/make.h
---- make-3.82/make.h	2010-08-11 15:34:12.000000000 +0200
-+++ make-3.82-pm/make.h	2010-08-11 15:31:26.000000000 +0200
-@@ -385,6 +385,8 @@ void die (int) __attribute__ ((noreturn)
- void log_working_directory (int);
- void pfatal_with_name (const char *) __attribute__ ((noreturn));
- void perror_with_name (const char *, const char *);
-+void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn));
-+void perror_with_name_err (const char *, const char *, int errnum);
- void *xmalloc (unsigned int);
- void *xcalloc (unsigned int);
- void *xrealloc (void *, unsigned int);
-diff -urp make-3.82/job.c make-3.82-pm/job.c
---- make-3.82/job.c	2010-07-24 10:27:50.000000000 +0200
-+++ make-3.82-pm/job.c	2010-08-11 15:33:54.000000000 +0200
-@@ -917,7 +917,7 @@ free_child (struct child *child)
- 
-       EINTRLOOP (r, write (job_fds[1], &token, 1));
-       if (r != 1)
--	pfatal_with_name (_("write jobserver"));
-+	pfatal_with_name_err (_("write jobserver"), errno);
- 
-       DB (DB_JOBS, (_("Released token for child %p (%s).\n"),
-                     child, child->file->name));
-@@ -1768,6 +1768,7 @@ new_job (struct file *file)
- 
-         /* Set interruptible system calls, and read() for a job token.  */
- 	set_child_handler_action_flags (1, waiting_jobs != NULL);
-+	errno = 0;
- 	got_token = read (job_rfd, &token, 1);
- 	saved_errno = errno;
- 	set_child_handler_action_flags (0, waiting_jobs != NULL);
-@@ -1782,10 +1783,14 @@ new_job (struct file *file)
- 
-         /* If the error _wasn't_ expected (EINTR or EBADF), punt.  Otherwise,
-            go back and reap_children(), and try again.  */
--	errno = saved_errno;
--        if (errno != EINTR && errno != EBADF)
--          pfatal_with_name (_("read jobs pipe"));
--        if (errno == EBADF)
-+        if (saved_errno != EINTR && saved_errno != EBADF)
-+	  {
-+	    if (got_token == 0)
-+	      fatal (NILF, _("read jobs pipe EOF"));
-+	    else
-+	      pfatal_with_name_err (_("read jobs pipe"), saved_errno);
-+	  }
-+        if (saved_errno == EBADF)
-           DB (DB_JOBS, ("Read returned EBADF.\n"));
-       }
- #endif
-@@ -1909,7 +1914,8 @@ load_too_high (void)
- 	    error (NILF,
-                    _("cannot enforce load limits on this operating system"));
- 	  else
--	    perror_with_name (_("cannot enforce load limit: "), "getloadavg");
-+	    perror_with_name_err (_("cannot enforce load limit: "),
-+				  "getloadavg", errno);
- 	}
-       lossage = errno;
-       load = 0;
-Только в make-3.82-pm: make.h~
-Только в make-3.82-pm: misc.c.orig

packages/devel/make/patches/make-3.82-017-newlines.patch

@@ -1,30 +0,0 @@
-diff -up make-3.82/job.c\~ make-3.82/job.c
---- make-3.82/job.c~	2010-08-12 14:57:15.000000000 +0200
-+++ make-3.82/job.c	2010-08-12 14:58:23.000000000 +0200
-@@ -2876,7 +2876,7 @@ construct_command_argv_internal (char *l
-       }
- 
-     new_line = alloca (shell_len + 1 + sflags_len + 1
--                             + (line_len*2) + 1);
-+                             + (line_len*4) + 1);
-     ap = new_line;
-     memcpy (ap, shell, shell_len);
-     ap += shell_len;
-@@ -2904,13 +2904,14 @@ construct_command_argv_internal (char *l
- #endif
- 	    if (PRESERVE_BSNL)
- 	      {
--		*(ap++) = '\\';
-+		*(ap++) = '\'';
- 		/* Only non-batch execution needs another backslash,
- 		   because it will be passed through a recursive
- 		   invocation of this function.  */
- 		if (!batch_mode_shell)
- 		  *(ap++) = '\\';
- 		*(ap++) = '\n';
-+		*(ap++) = '\'';
- 	      }
- 	    ++p;
- 	    continue;
-
-Diff finished.  Thu Aug 12 14:58:34 2010

packages/devel/make/patches/make-3.82-018-jobserver.patch

@@ -1,19 +0,0 @@
-diff -up make-3.82/main.c\~ make-3.82/main.c
---- make-3.82/main.c~	2010-08-12 14:59:20.000000000 +0200
-+++ make-3.82/main.c	2010-08-12 15:00:07.000000000 +0200
-@@ -1756,8 +1756,11 @@ main (int argc, char **argv, char **envp
- 
-       if (job_slots > 0)
-         {
--          close (job_fds[0]);
--          close (job_fds[1]);
-+	  if (restarts == 0)
-+	    {
-+	      close (job_fds[0]);
-+	      close (job_fds[1]);
-+	    }
-           job_fds[0] = job_fds[1] = -1;
-           free (jobserver_fds->list);
-           free (jobserver_fds);
-
-Diff finished.  Thu Aug 12 15:00:22 2010

packages/devel/make/patches/make-3.82-019-bugfixes.patch

@@ -1,250 +0,0 @@
-diff -urpN make/ChangeLog make-new/ChangeLog
---- make/ChangeLog	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/ChangeLog	2010-09-13 13:42:09.000000000 +0200
-@@ -1,3 +1,22 @@
-+2010-08-13  Paul Smith  <psmith@gnu.org>
-+
-+	* NEWS: Accidentally forgot to back out the sorted wildcard
-+	enhancement in 3.82, so update NEWS.
-+	Also add NEWS about the error check for explicit and pattern
-+	targets in the same rule, added to 3.82.
-+
-+	* main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
-+	this in 3.82!)
-+
-+	* read.c (parse_file_seq): Fix various errors parsing archives
-+	with multiple objects in the parenthesis, as well as wildcards.
-+	Fixes Savannah bug #30612.
-+
-+2010-08-10  Paul Smith  <psmith@gnu.org>
-+
-+	* main.c (main): Expand MAKEFLAGS before adding it to the
-+	environment when re-exec'ing.  Fixes Savannah bug #30723.
-+
- 2010-07-28  Paul Smith  <psmith@gnu.org>
- 
- 	Version 3.82 released.
-diff -urpN make/main.c make-new/main.c
---- make/main.c	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/main.c	2010-09-13 13:42:12.000000000 +0200
-@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
-diff -urpN make/NEWS make-new/NEWS
---- make/NEWS	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/NEWS	2010-09-13 13:42:11.000000000 +0200
-@@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m
- * Compiling GNU make now requires a conforming ISO C 1989 compiler and
-   standard runtime library.
- 
--* WARNING: Future backward-incompatibility!
--  Wildcards are not documented as returning sorted values, but up to and
--  including this release the results have been sorted and some makefiles are
--  apparently depending on that.  In the next release of GNU make, for
--  performance reasons, we may remove that sorting.  If your makefiles
--  require sorted results from wildcard expansions, use the $(sort ...)
--  function to request it explicitly.
--
- * WARNING: Backward-incompatibility!
-   The POSIX standard for make was changed in the 2008 version in a
-   fundamentally incompatible way: make is required to invoke the shell as if
-@@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m
-   existing targets were provided in $?).
- 
- * WARNING: Backward-incompatibility!
-+  Wildcards were not documented as returning sorted values, but the results
-+  have been sorted up until this release..  If your makefiles require sorted
-+  results from wildcard expansions, use the $(sort ...)  function to request
-+  it explicitly.
-+
-+* WARNING: Backward-incompatibility!
-+  In previous versions of make it was acceptable to list one or more explicit
-+  targets followed by one or more pattern targets in the same rule and it
-+  worked "as expected".  However, this was not documented as acceptable and if
-+  you listed any explicit targets AFTER the pattern targets, the entire rule
-+  would be mis-parsed.  This release removes this ability completely: make
-+  will generate an error message if you mix explicit and pattern targets in
-+  the same rule.
-+
-+* WARNING: Backward-incompatibility!
-   As a result of parser enhancements, three backward-compatibility issues
-   exist: first, a prerequisite containing an "=" cannot be escaped with a
-   backslash any longer.  You must create a variable containing an "=" and
-diff -urpN make/read.c make-new/read.c
---- make/read.c	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/read.c	2010-09-13 13:42:11.000000000 +0200
-@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
-diff -urpN make/tests/ChangeLog make-new/tests/ChangeLog
---- make/tests/ChangeLog	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/tests/ChangeLog	2010-09-13 13:42:10.000000000 +0200
-@@ -1,3 +1,16 @@
-+2010-08-13  Paul Smith  <psmith@gnu.org>
-+
-+	* scripts/features/archives: New regression tests for archive
-+	support.  Test for fix to Savannah bug #30612.
-+
-+	* run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
-+	the features available in $(.FEATURES).
-+
-+2010-08-10  Paul Smith  <psmith@gnu.org>
-+
-+	* scripts/features/reinvoke: Ensure command line variable settings
-+	are preserved across make re-exec.  Tests Savannah bug #30723.
-+
- 2010-07-28  Paul Smith  <psmith@gnu.org>
- 
- 	* scripts/targets/POSIX: Compatibility issues with Solaris (and
-diff -urpN make/tests/run_make_tests.pl make-new/tests/run_make_tests.pl
---- make/tests/run_make_tests.pl	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/tests/run_make_tests.pl	2010-09-13 13:42:10.000000000 +0200
-@@ -29,6 +29,7 @@
- # You should have received a copy of the GNU General Public License along with
- # this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+%FEATURES = ();
- 
- $valgrind = 0;              # invoke make with valgrind
- $valgrind_args = '';
-@@ -367,6 +368,8 @@ sub set_more_defaults
-      $parallel_jobs = 1;
-    }
- 
-+   %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
-+
-    # Set up for valgrind, if requested.
- 
-    if ($valgrind) {
-diff -urpN make/tests/scripts/features/archives make-new/tests/scripts/features/archives
---- make/tests/scripts/features/archives	1970-01-01 01:00:00.000000000 +0100
-+++ make-new/tests/scripts/features/archives	2010-09-13 13:42:10.000000000 +0200
-@@ -0,0 +1,42 @@
-+#                                                              -*-mode: perl-*-
-+
-+$description = "Test GNU make's archive management features.";
-+
-+$details = "\
-+This only works on systems that support it.";
-+
-+# If this instance of make doesn't support archives, skip it
-+exists $FEATURES{archives} or return -1;
-+
-+# Create some .o files to work with
-+utouch(-60, qw(a1.o a2.o a3.o));
-+
-+# Very simple
-+run_make_test('all: libxx.a(a1.o)',
-+              '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
-+
-+# Multiple .o's.  Add a new one to the existing library
-+run_make_test('all: libxx.a(a1.o a2.o)',
-+              '', "ar rv libxx.a a2.o\na - a2.o\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-40, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use wildcards
-+run_make_test('all: libxx.a(*.o)',
-+              '', "#MAKE#: Nothing to be done for `all'.\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-30, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use both wildcards and simple names
-+utouch(-50, 'a2.o');
-+run_make_test('all: libxx.a(a3.o *.o)', '',
-+              "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
-+
-+rmfiles(qw(a1.o a2.o a3.o libxx.a));
-+
-+# This tells the test driver that the perl test script executed properly.
-+1;
-diff -urpN make/tests/scripts/features/reinvoke make-new/tests/scripts/features/reinvoke
---- make/tests/scripts/features/reinvoke	2010-09-13 13:42:35.000000000 +0200
-+++ make-new/tests/scripts/features/reinvoke	2010-09-13 13:42:10.000000000 +0200
-@@ -57,9 +57,24 @@ include $(F)',
- # Now try with the file we're not updating being the actual file we're
- # including: this and the previous one test different parts of the code.
- 
--run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
-+run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
- 
- &rmfiles('a','b','c');
- 
-+# Ensure command line variables are preserved properly across re-exec
-+# Tests for Savannah bug #30723
-+
-+run_make_test('
-+ifdef RECURSE
-+-include foo30723
-+endif
-+recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
-+test: ; @echo F.O=$(F.O)
-+foo30723: ; @touch $@
-+',
-+              '--no-print-directory F.O=bar', "F.O=bar\n");
-+
-+unlink('foo30723');
-+
- # This tells the test driver that the perl test script executed properly.
- 1;

packages/devel/make/patches/make-3.82-020-sort-blank.patch

@@ -1,22 +0,0 @@
-diff -urp make-3.82/function.c make-3.82-pm/function.c
---- make-3.82/function.c	2010-07-13 03:20:39.000000000 +0200
-+++ make-3.82-pm/function.c	2010-10-27 01:43:27.000000000 +0200
-@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
-     {
-       char c = *(t++);
- 
--      if (! isspace ((unsigned char)c))
-+      if (! isblank ((unsigned char)c))
-         continue;
- 
-       ++wordi;
- 
--      while (isspace ((unsigned char)*t))
-+      while (isblank ((unsigned char)*t))
-         ++t;
-     }
- 
-Только в make-3.82-pm: function.c~
-Двоичные файлы make-3.82/function.o и make-3.82-pm/function.o различаются
-Двоичные файлы make-3.82/make и make-3.82-pm/make различаются
-Только в make-3.82-pm: misc.c~

packages/devel/make/patches/make-3.82-021-copy-on-expand.patch

@@ -1,77 +0,0 @@
-From 2f661dc20617ba6fdeb2d7e243dc898653faafea Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 26 Apr 2011 21:50:26 +0200
-Subject: [PATCH] Always copy the string before expanding it
-
-It might get freed during expansion, e.g. with eval function.
-A simple reproducer:
-
-TRUE = $(eval TRUE := true)
-all:
-	$(TRUE)
----
- ChangeLog |    5 +++++
- expand.c  |   18 +++++++++---------
- 2 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 91878fb..7519164 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2011-04-26  Lubomir Rintel  <lkundrak@v3.sk>
-+
-+	* expand.c (variable_expand_string): Always copy the string
-+	to expand.
-+
- 2010-08-13  Paul Smith  <psmith@gnu.org>
- 
- 	* NEWS: Accidentally forgot to back out the sorted wildcard
-diff --git a/expand.c b/expand.c
-index 2315b06..3e6e346 100644
---- a/expand.c
-+++ b/expand.c
-@@ -197,7 +197,7 @@ variable_expand_string (char *line, const char *string, long length)
- {
-   struct variable *v;
-   const char *p, *p1;
--  char *abuf = NULL;
-+  char *abuf;
-   char *o;
-   unsigned int line_offset;
- 
-@@ -214,14 +214,15 @@ variable_expand_string (char *line, const char *string, long length)
- 
-   /* If we want a subset of the string, allocate a temporary buffer for it.
-      Most of the functions we use here don't work with length limits.  */
--  if (length > 0 && string[length] != '\0')
-+  if (length == -1)
-     {
--      abuf = xmalloc(length+1);
--      memcpy(abuf, string, length);
--      abuf[length] = '\0';
--      string = abuf;
-+      length = strlen (string);
-     }
--  p = string;
-+
-+  abuf = xmalloc(length+1);
-+  memcpy(abuf, string, length);
-+  abuf[length] = '\0';
-+  p = abuf;
- 
-   while (1)
-     {
-@@ -411,8 +412,7 @@ variable_expand_string (char *line, const char *string, long length)
-       ++p;
-     }
- 
--  if (abuf)
--    free (abuf);
-+  free (abuf);
- 
-   variable_buffer_output (o, "", 1);
-   return (variable_buffer + line_offset);
--- 
-1.7.4.1
-

packages/devel/make/patches/make-3.82-022-parallel-remake.patch

@@ -1,30 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.247
-retrieving revision 1.246
-diff -u -r1.247 -r1.246
---- a/main.c	18 Sep 2011 23:39:26 -0000	1.247
-+++ b/main.c	29 Aug 2010 23:05:27 -0000	1.246
-@@ -2089,6 +2089,11 @@
- 
-           ++restarts;
- 
-+          /* If we're re-exec'ing the first make, put back the number of
-+             job slots so define_makefiles() will get it right.  */
-+          if (master_job_slots)
-+            job_slots = master_job_slots;
-+
-           /* Reset makeflags in case they were changed.  */
-           {
-             const char *pv = define_makeflags (1, 1);
-@@ -2830,9 +2825,6 @@
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
--	      else if (cs->c == 'j')
--		/* Special case for `-j'.  */
--		ADD_FLAG ("1", 1);
- 	      else
- 		{
- 		  char *buf = alloca (30);

packages/devel/make/patches/make-3.82-023-warn_undefined_function.patch

@@ -1,84 +0,0 @@
-diff --git a/function.c b/function.c
-index e2f6c8c..ff0527f 100644
---- a/function.c
-+++ b/function.c
-@@ -2333,8 +2333,10 @@ func_call (char *o, char **argv, const char *funcname UNUSED)
-   v = lookup_variable (fname, flen);
- 
-   if (v == 0)
--    warn_undefined (fname, flen);
--
-+    {
-+      warn_undefined (fname, flen);
-+      warn_undefined_function (fname, flen);
-+    }
-   if (v == 0 || *v->value == '\0')
-     return o;
- 
-diff --git a/main.c b/main.c
-index c6989e3..2f545a7 100644
---- a/main.c
-+++ b/main.c
-@@ -275,6 +275,11 @@ static int print_usage_flag = 0;
- 
- int warn_undefined_variables_flag;
- 
-+/* If nonzero, we should print a warning message
-+   for each attemtp to call an undefined user function.  */
-+
-+int warn_undefined_functions_flag;
-+
- /* If nonzero, always build all targets, regardless of whether
-    they appear out of date or not.  */
- 
-@@ -368,6 +373,8 @@ static const char *const usage[] =
-                               Consider FILE to be infinitely new.\n"),
-     N_("\
-   --warn-undefined-variables  Warn when an undefined variable is referenced.\n"),
-+    N_("\
-+  --warn-undefined-functions  Warn when an undefined user function is called.\n"),
-     NULL
-   };
- 
-@@ -424,6 +431,8 @@ static const struct command_switch switches[] =
-     { CHAR_MAX+5, flag, &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
-       "warn-undefined-variables" },
-     { CHAR_MAX+6, string, &eval_strings, 1, 0, 0, 0, 0, "eval" },
-+    { CHAR_MAX+7, flag, &warn_undefined_functions_flag, 1, 1, 0, 0, 0,
-+      "warn-undefined-functions" },
-     { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-   };
- 
-diff --git a/make.h b/make.h
-index 60ade4c..f2ebb56 100644
---- a/make.h
-+++ b/make.h
-@@ -513,7 +513,7 @@ extern int env_overrides, no_builtin_rules_flag, no_builtin_variables_flag;
- extern int print_version_flag, print_directory_flag, check_symlink_flag;
- extern int warn_undefined_variables_flag, posix_pedantic, not_parallel;
- extern int second_expansion, clock_skew_detected, rebuilding_makefiles;
--extern int one_shell;
-+extern int one_shell, warn_undefined_functions_flag;
- 
- /* can we run commands via 'sh -c xxx' or must we use batch files? */
- extern int batch_mode_shell;
-diff --git a/variable.h b/variable.h
-index c215867..02713c1 100644
---- a/variable.h
-+++ b/variable.h
-@@ -220,6 +220,13 @@ void undefine_variable_in_set (const char *name, unsigned int length,
-                                 (int)(l), (n)); \
-                               }while(0)
- 
-+#define warn_undefined_function(n,l) do{\
-+                              if (warn_undefined_functions_flag) \
-+                                error (reading_file, \
-+                                       _("warning: undefined function `%.*s'"), \
-+                                (int)(l), (n)); \
-+                              }while(0)
-+
- char **target_environment (struct file *file);
- 
- struct pattern_var *create_pattern_var (const char *target,
---
-cgit v0.9.0.2-2-gbebe

packages/devel/make/patches/make-3.82-024-trace.patch

@@ -1,111 +0,0 @@
-
-This patch add the support for --debug=c and --debug=e to make
-this option when activated will trace in stdout the activity of $(call and $(eval in the Makefile
-
-The trace use the format:
- ### xxx -->
- ### xxx <--
-the number of space before ### is at least 1 and increase with the nesting of eval/call
-
-usage: make --debug=c,e
-
-diff -r -u make-3.82/debug.h make-3.82-lo_trace/debug.h
---- make-3.82/debug.h	2010-07-12 20:20:38.000000000 -0500
-+++ make-3.82-lo_trace/debug.h	2011-06-22 12:06:37.000000000 -0500
-@@ -21,6 +21,8 @@
- #define DB_JOBS         (0x004)
- #define DB_IMPLICIT     (0x008)
- #define DB_MAKEFILES    (0x100)
-+#define DB_CALL       (0x01000)
-+#define DB_EVAL       (0x02000)
- 
- #define DB_ALL          (0xfff)
- 
-diff -r -u make-3.82/function.c make-3.82-lo_trace/function.c
---- make-3.82/function.c	2011-06-23 01:01:35.000000000 -0500
-+++ make-3.82-lo_trace/function.c	2011-06-23 01:40:05.000000000 -0500
-@@ -28,6 +28,8 @@
- #include "amiga.h"
- #endif
- 
-+static int depth = 0;
-+
- 
- struct function_table_entry
-   {
-@@ -1371,7 +1373,12 @@
- 
-   install_variable_buffer (&buf, &len);
- 
-+  depth += 1;
-+  DBS( DB_EVAL, ("### eval -->\n"));
-+  DB( DB_EVAL, ("%s\n", argv[0]));
-   eval_buffer (argv[0]);
-+  DBS( DB_EVAL, ("### eval <--\n"));
-+  depth -= 1;
- 
-   restore_variable_buffer (buf, len);
- 
-@@ -2338,6 +2345,7 @@
-   if (v == 0 || *v->value == '\0')
-     return o;
- 
-+  depth += 1;
-   body = alloca (flen + 4);
-   body[0] = '$';
-   body[1] = '(';
-@@ -2345,6 +2353,7 @@
-   body[flen+2] = ')';
-   body[flen+3] = '\0';
- 
-+  DBS(DB_CALL, ("### call %s -->\n", body));
-   /* Set up arguments $(1) .. $(N).  $(0) is the function name.  */
- 
-   push_new_variable_scope ();
-@@ -2354,6 +2363,7 @@
-       char num[11];
- 
-       sprintf (num, "%d", i);
-+      DBS(DB_CALL, ("### arg %i for call %s is '%s'\n", i, body, *argv));
-       define_variable (num, strlen (num), *argv, o_automatic, 0);
-     }
- 
-@@ -2367,6 +2377,7 @@
-       char num[11];
- 
-       sprintf (num, "%d", i);
-+      DBS(DB_CALL, ("### arg %i for call %s is implicit\n", i, body));
-       define_variable (num, strlen (num), "", o_automatic, 0);
-     }
- 
-@@ -2377,7 +2388,14 @@
- 
-   saved_args = max_args;
-   max_args = i;
-+
-   o = variable_expand_string (o, body, flen+3);
-+  DBS(DB_CALL, ("### call to %s expended into\n", body));
-+  DB(DB_CALL, ("%s\n", o));
-+  DBS(DB_CALL, ("### call %s <--\n", body));
-+
-+  depth -= 1;
-+
-   max_args = saved_args;
- 
-   v->exp_count = 0;
-diff -r -u make-3.82/main.c make-3.82-lo_trace/main.c
---- make-3.82/main.c	2010-07-19 02:10:53.000000000 -0500
-+++ make-3.82-lo_trace/main.c	2011-06-22 11:46:39.000000000 -0500
-@@ -634,6 +634,12 @@
-             case 'b':
-               db_level |= DB_BASIC;
-               break;
-+            case 'c':
-+              db_level |= DB_CALL;
-+              break;
-+            case 'e':
-+              db_level |= DB_EVAL;
-+              break;
-             case 'i':
-               db_level |= DB_BASIC | DB_IMPLICIT;
-               break;

packages/devel/make/patches/make-3.82-025-expensive_glob.patch

@@ -1,116 +0,0 @@
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.198
-retrieving revision 1.200
-diff -u -r1.198 -r1.200
---- a/read.c	29 Apr 2011 15:27:39 -0000	1.198
-+++ b/read.c	7 May 2011 14:36:12 -0000	1.200
-@@ -2901,6 +2901,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3109,32 +3110,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
-Index: tests/scripts/functions/wildcard
-===================================================================
-RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- a/tests/scripts/functions/wildcard	13 Jun 2009 21:21:49 -0000	1.6
-+++ b/tests/scripts/functions/wildcard	7 May 2011 14:36:11 -0000	1.7
-@@ -88,4 +88,16 @@
- !,
-               '', "\n");
- 
-+# TEST #5: wildcard used to verify file existence
-+
-+touch('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=xxx.yyy\n");
-+
-+unlink('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=\n");
-+
- 1;

packages/devel/pcre/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.33"
+PKG_VERSION="8.35"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/Mesa/patches/Mesa-03-recreate-sampler-view-on-context-change.patch

@@ -0,0 +1,39 @@
+From 92e543c45da4581b1940178a94e6f2d66c749367 Mon Sep 17 00:00:00 2001
+From: Christian König <christian.koenig@amd.com>
+Date: Sat, 22 Mar 2014 20:30:07 +0000
+Subject: st/mesa: recreate sampler view on context change v3
+
+With shared glx contexts it is possible that a texture is create and used
+in one context and then used in another one resulting in incorrect
+sampler view usage.
+
+v2: avoid template copy
+v3: add XXX comment
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Cc: "10.0 10.1" <mesa-stable@lists.freedesktop.org>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+---
+diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
+index 3557a3f..75e6fac 100644
+--- a/src/mesa/state_tracker/st_atom_texture.c
++++ b/src/mesa/state_tracker/st_atom_texture.c
+@@ -198,6 +198,16 @@ st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
+    if (!stObj->sampler_view) {
+       stObj->sampler_view =
+          st_create_texture_sampler_view_from_stobj(pipe, stObj, samp, format);
++
++   } else if (stObj->sampler_view->context != pipe) {
++      /* Recreate view in correct context, use existing view as template */
++      /* XXX: This isn't optimal, we should try to use more than one view.
++              Otherwise we create/destroy the view all the time
++       */
++      struct pipe_sampler_view *sv =
++         pipe->create_sampler_view(pipe, stObj->pt, stObj->sampler_view);
++      pipe_sampler_view_reference(&stObj->sampler_view, NULL);
++      stObj->sampler_view = sv;
+    }
+ 
+    return stObj->sampler_view;
+--
+cgit v0.9.0.2-2-gbebe

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="bec4bd0"
+PKG_VERSION="3ade415"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/glew/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="glew"
-PKG_VERSION="1.9.0"
+PKG_VERSION="1.10.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/graphics/libdrm/package.mk

@@ -48,7 +48,7 @@ configure_target() {
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-intel/enable-intel/'`
 
-    [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ] && \
+    [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeonsi" ] && \
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-radeon/enable-radeon/'`
 

packages/graphics/libpng/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.9"
+PKG_VERSION="1.6.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/lang/gcc/patches/gcc-initial-attempt-at-fixing-push_minipool_fix-ICE-2.patch

@@ -0,0 +1,118 @@
+Date: Tue, 18 Jun 2013 16:42:13 +0100
+From: Julian Brown <julian at codesourcery dot com>
+To: <gcc-patches at gcc dot gnu dot org>, Richard Earnshaw <Richard dot Earnshaw at arm dot com>,	Ramana Radhakrishnan <ramrad01 at arm dot com>
+Subject: [PATCH, ARM] Reintroduce minipool ranges for zero-extension insn patterns
+
+Hi,
+
+The following patch removed pool_range/neg_pool_range attributes from
+several instructions as a cleanup, which I believe to have been
+incorrect:
+
+http://gcc.gnu.org/ml/gcc-patches/2010-07/msg01036.html
+
+On a Mentor-local branch, this caused problems with instructions like:
+
+(insn 77 53 87 (set (reg:SI 8 r8 [orig:197 s.4 ] [197])
+        (zero_extend:SI (mem/u/c:HI (symbol_ref/u:SI ("*.LC0") [flags 0x2]) [7 S2 A16]))) [...] 161 {*arm_zero_extendhisi2_v6}
+     (nil))
+
+The reasoning behind the cleanup was that the instructions in question
+have no immediate constraints -- but the minipool code is used for more
+than just immediates, e.g. in the above case where a symbol reference
+("m") is loaded.
+
+I don't have a test case for the problem on mainline at present, but I
+believe it is still a latent bug. Tested with the default multilibs (ARM
+& Thumb mode) on arm-none-eabi, with no regressions. (The patch has
+also been tested with more multilibs on our local branches for a while,
+and I did ensure previously that it did not adversely affect Bernd's
+patch linked above.)
+
+OK to apply?
+
+Thanks,
+
+Julian
+
+ChangeLog
+
+	gcc/
+	* arm.md (*thumb1_zero_extendhisi2, *arm_zero_extendhisi2)
+	(*arm_zero_extendhisi2_v6, *thumb1_zero_extendqisi2)
+	(*thumb1_zero_extendqisi2_v6, *arm_zero_extendqisi2)
+	(*arm_zero_extendqisi2_v6): Add pool_range, neg_pool_range
+	attributes.
+
+
+Index: gcc/config/arm/arm.md
+===================================================================
+--- a/gcc/config/arm/arm.md	(revision 200171)
++++ b/gcc/config/arm/arm.md	(working copy)
+@@ -5313,7 +5313,8 @@
+ 			 [(if_then_else (eq_attr "is_arch6" "yes")
+ 				       (const_int 2) (const_int 4))
+ 			 (const_int 4)])
+-   (set_attr "type" "simple_alu_shift, load_byte")]
++   (set_attr "type" "simple_alu_shift, load_byte")
++   (set_attr "pool_range" "*,60")]
+ )
+ 
+ (define_insn "*arm_zero_extendhisi2"
+@@ -5324,7 +5325,9 @@
+    #
+    ldr%(h%)\\t%0, %1"
+   [(set_attr "type" "alu_shift,load_byte")
+-   (set_attr "predicable" "yes")]
++   (set_attr "predicable" "yes")
++   (set_attr "pool_range" "*,256")
++   (set_attr "neg_pool_range" "*,244")]
+ )
+ 
+ (define_insn "*arm_zero_extendhisi2_v6"
+@@ -5335,7 +5338,9 @@
+    uxth%?\\t%0, %1
+    ldr%(h%)\\t%0, %1"
+   [(set_attr "predicable" "yes")
+-   (set_attr "type" "simple_alu_shift,load_byte")]
++   (set_attr "type" "simple_alu_shift,load_byte")
++   (set_attr "pool_range" "*,256")
++   (set_attr "neg_pool_range" "*,244")]
+ )
+ 
+ (define_insn "*arm_zero_extendhisi2addsi"
+@@ -5405,7 +5410,8 @@
+    uxtb\\t%0, %1
+    ldrb\\t%0, %1"
+   [(set_attr "length" "2")
+-   (set_attr "type" "simple_alu_shift,load_byte")]
++   (set_attr "type" "simple_alu_shift,load_byte")
++   (set_attr "pool_range" "*,32")]
+ )
+ 
+ (define_insn "*arm_zero_extendqisi2"
+@@ -5417,7 +5423,9 @@
+    ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
+   [(set_attr "length" "8,4")
+    (set_attr "type" "alu_shift,load_byte")
+-   (set_attr "predicable" "yes")]
++   (set_attr "predicable" "yes")
++   (set_attr "pool_range" "*,4096")
++   (set_attr "neg_pool_range" "*,4084")]
+ )
+ 
+ (define_insn "*arm_zero_extendqisi2_v6"
+@@ -5428,7 +5436,9 @@
+    uxtb%(%)\\t%0, %1
+    ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
+   [(set_attr "type" "simple_alu_shift,load_byte")
+-   (set_attr "predicable" "yes")]
++   (set_attr "predicable" "yes")
++   (set_attr "pool_range" "*,4096")
++   (set_attr "neg_pool_range" "*,4084")]
+ )
+ 
+ (define_insn "*arm_zero_extendqisi2addsi"
+
+--MP_/ERKB4.gCWGZVf9oWJO6IZSe--
+

packages/lang/nasm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="nasm"
-PKG_VERSION="2.10.07"
+PKG_VERSION="2.11.02"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8188EU/package.mk

@@ -16,13 +16,8 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-# driver taken from
-# https://github.com/Red54/linux-shumeipai2/commit/026ba2734e035b2bde089a836912d6febabe87f3
-# and patched like the RTL8192CU driver for usage on kernel 3.7 and later
-
 PKG_NAME="RTL8188EU"
-# realtek: PKG_VERSION="20130425"
+PKG_VERSION="fcc9034"
-PKG_VERSION="fb786d0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8192CU/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8192CU"
-PKG_VERSION="v3.4.4_4749.20121105"
+PKG_VERSION="v4.0.2_9000.20130911"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-001-use_kthread_run_v2.patch

@@ -1,131 +0,0 @@
-diff -ruN a/core/rtw_mp.c b/core/rtw_mp.c
---- a/core/rtw_mp.c	2012-07-30 12:51:05.000000000 +0000
-+++ b/core/rtw_mp.c	2013-03-17 19:00:28.393782000 +0000
-@@ -1140,8 +1140,7 @@
- 	_rtw_memset(ptr, payload, pkt_end - ptr);
- 
- 	//3 6. start thread
--	pmp_priv->tx.PktTxThread = kernel_thread(mp_xmit_packet_thread, pmp_priv, CLONE_FS|CLONE_FILES);
--	if(pmp_priv->tx.PktTxThread < 0)
-+	if(!start_kthread(&pmp_priv->tx.PktTxThread, mp_xmit_packet_thread, pmp_priv, "8192cu-mp-xmit"))
- 		DBG_871X("Create PktTx Thread Fail !!!!!\n");
- 
- }
-diff -ruN a/include/osdep_service.h b/include/osdep_service.h
---- a/include/osdep_service.h	2012-07-30 12:51:05.000000000 +0000
-+++ b/include/osdep_service.h	2013-03-17 17:37:39.105483734 +0000
-@@ -100,6 +100,9 @@
- 	#include <linux/pci.h>
- #endif
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0))
-+	#include <linux/kthread.h>
-+#endif
- 	
- #ifdef CONFIG_USB_HCI
- 	typedef struct urb *  PURB;
-@@ -133,8 +136,12 @@
- 	//typedef u32	_irqL;
- 	typedef unsigned long _irqL;
- 	typedef	struct	net_device * _nic_hdl;
--	
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
- 	typedef pid_t		_thread_hdl_;
-+#else
-+	typedef struct task_struct * _thread_hdl_;
-+#endif
- 	typedef int		thread_return;
- 	typedef void*	thread_context;
- 
-@@ -572,7 +579,7 @@
- #ifdef PLATFORM_LINUX
- 	//struct net_device *pnetdev = (struct net_device *)context;
- 	//daemonize("%s", pnetdev->name);
--	daemonize("%s", "RTKTHREAD");
-+	//daemonize("%s", "RTKTHREAD");
- 	allow_signal(SIGTERM);
- #endif
- }
-@@ -827,4 +834,8 @@
- 
- #endif
- 
-+#ifdef PLATFORM_LINUX
-+extern int start_kthread(_thread_hdl_ *t_hdl, int (*threadfn)(void *data),
-+			 void *data, const char *name);
-+#endif
- 
-diff -ruN a/include/rtw_recv.h b/include/rtw_recv.h
---- a/include/rtw_recv.h	2012-07-30 12:51:05.000000000 +0000
-+++ b/include/rtw_recv.h	2013-03-17 17:35:36.136873966 +0000
-@@ -623,8 +623,9 @@
- 	//from any given member of recv_frame.
- 	// rxmem indicates the any member/address in recv_frame
- 	
--	return (union recv_frame*)(((uint)rxmem>>RXFRAME_ALIGN) <<RXFRAME_ALIGN) ;
--	
-+	//return (union recv_frame*)(((uint)rxmem>>RXFRAME_ALIGN) <<RXFRAME_ALIGN) ;
-+	//return (union recv_frame*)(((SIZE_PTR)rxmem >> RXFRAME_ALIGN) << RXFRAME_ALIGN);
-+	return (union recv_frame*)(((ulong)rxmem>>RXFRAME_ALIGN) <<RXFRAME_ALIGN) ; 
- }
- 
- __inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
-diff -ruN a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
---- a/os_dep/linux/os_intfs.c	2012-11-05 07:42:45.000000000 +0000
-+++ b/os_dep/linux/os_intfs.c	2013-03-17 19:00:28.393782000 +0000
-@@ -797,27 +797,22 @@
- 	RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_start_drv_threads\n"));
- 
- #ifdef CONFIG_SDIO_HCI
--	padapter->xmitThread = kernel_thread(rtw_xmit_thread, padapter, CLONE_FS|CLONE_FILES);
--	if(padapter->xmitThread < 0)
-+	if(!start_kthread(&padapter->xmitThread, rtw_xmit_thread, padapter, "8192cu-xmit"))
- 		_status = _FAIL;
- #endif
- 
- #ifdef CONFIG_RECV_THREAD_MODE
--	padapter->recvThread = kernel_thread(recv_thread, padapter, CLONE_FS|CLONE_FILES);
--	if(padapter->recvThread < 0)
-+	if(!start_kthread(&padapter->recvThread, recv_thread, padapter, "8192cu-recv"))
- 		_status = _FAIL;	
- #endif
- 
--	padapter->cmdThread = kernel_thread(rtw_cmd_thread, padapter, CLONE_FS|CLONE_FILES);
--	if(padapter->cmdThread < 0)
-+	if(!start_kthread(&padapter->cmdThread, rtw_cmd_thread, padapter, "8192cu-cmd"))
- 		_status = _FAIL;
- 	else
- 		_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema); //wait for cmd_thread to run
--		
- 
- #ifdef CONFIG_EVENT_THREAD_MODE
--	padapter->evtThread = kernel_thread(event_thread, padapter, CLONE_FS|CLONE_FILES);
--	if(padapter->evtThread < 0)
-+	if(!start_kthread(&padapter->evtThread, event_thread, padapter, "8192cu-evt"))
- 		_status = _FAIL;		
- #endif
- 
-diff -ruN a/os_dep/osdep_service.c b/os_dep/osdep_service.c
---- a/os_dep/osdep_service.c	2012-07-30 12:51:05.000000000 +0000
-+++ b/os_dep/osdep_service.c	2013-03-17 19:00:28.393782000 +0000
-@@ -1553,3 +1553,19 @@
- #endif
- }
- 
-+#ifdef PLATFORM_LINUX
-+int start_kthread(_thread_hdl_ *t_hdl, int (*threadfn)(void *data),
-+		  void *data, const char *name)
-+{
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
-+	*t_hdl = kernel_thread(threadfn, data, CLONE_FS|CLONE_FILES);
-+	if(*t_hdl < 0)
-+#else
-+	*t_hdl = kthread_run(threadfn, data, name);
-+	if(IS_ERR(*t_hdl))
-+#endif
-+		return 0;
-+	return -1;
-+}
-+#endif
-+

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-002-linux-3.10-proc_create-1.patch

@@ -1,285 +0,0 @@
-From 0bb2e327dd12e44fbd67ff169217fa1f7f0c609b Mon Sep 17 00:00:00 2001
-From: kolasa <kkolasa@winsoft.pl>
-Date: Sun, 12 May 2013 21:21:46 +0200
-Subject: [PATCH] switching to proc_create ( /proc for read/write is not yet
- usable )
-
----
- .../os_dep/linux/os_intfs.c                        | 105 ++++++++++++++++++++-
- 1 file changed, 100 insertions(+), 5 deletions(-)
-
-diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
-index 4d057a6..17f46f6 100644
---- a/os_dep/linux/os_intfs.c
-+++ b/os_dep/linux/os_intfs.c
-@@ -275,14 +275,22 @@ void rtw_proc_init_one(struct net_device *dev)
- #if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- 		rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net);
- #else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 		rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net);
-+#else
-+		rtw_proc=proc_mkdir(rtw_proc_name, init_net.proc_net);
-+#endif
- #endif
- 		if (rtw_proc == NULL) {
- 			DBG_8192C(KERN_ERR "Unable to create rtw_proc directory\n");
- 			return;
- 		}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 		entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);				   
-+#else
-+		entry = proc_create_data("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);				   
-+#endif
- 		if (!entry) {
- 			DBG_871X("Unable to create_proc_read_entry!\n"); 
- 			return;
-@@ -293,10 +301,13 @@ void rtw_proc_init_one(struct net_device *dev)
- 
- 	if(padapter->dir_dev == NULL)
- 	{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 		padapter->dir_dev = create_proc_entry(dev->name, 
- 					  S_IFDIR | S_IRUGO | S_IXUGO, 
- 					  rtw_proc);
--
-+#else
-+		padapter->dir_dev = proc_mkdir(dev->name,rtw_proc);
-+#endif
- 		dir_dev = padapter->dir_dev;
- 
- 		if(dir_dev==NULL)
-@@ -324,84 +335,136 @@ void rtw_proc_init_one(struct net_device *dev)
- 
- 	rtw_proc_cnt++;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_write_reg, dev);				   
-+#else
-+	entry = proc_create_data("write_reg", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_write_reg, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry->write_proc = proc_set_write_reg;
- 
- 	entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_read_reg, dev);				   
-+#else
-+	entry = proc_create_data("read_reg", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_read_reg, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry->write_proc = proc_set_read_reg;
- 
--	
- 	entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_fwstate, dev);				   
-+#else
-+	entry = proc_create_data("fwstate", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_fwstate, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_sec_info, dev);				   
-+#else
-+	entry = proc_create_data("sec_info", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_sec_info, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_mlmext_state, dev);				   
-+#else
-+	entry = proc_create_data("mlmext_state", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_mlmext_state, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_qos_option, dev);				   
-+#else
-+	entry = proc_create_data("qos_option", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_qos_option, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_ht_option, dev);				   
-+#else
-+	entry = proc_create_data("ht_option", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_ht_option, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_rf_info, dev);				   
-+#else
-+	entry = proc_create_data("rf_info", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_rf_info, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 	
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_ap_info, dev);				   
-+#else
-+	entry = proc_create_data("ap_info", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_ap_info, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_adapter_state, dev);				   
-+#else
-+	entry = proc_create_data("adapter_state", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_adapter_state, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_trx_info, dev);				   
-+#else
-+	entry = proc_create_data("trx_info", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_trx_info, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
-@@ -409,8 +472,13 @@ void rtw_proc_init_one(struct net_device *dev)
- 
- #ifdef CONFIG_AP_MODE
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_all_sta_info, dev);				   
-+#else
-+	entry = proc_create_data("all_sta_info", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_all_sta_info, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
-@@ -418,8 +486,13 @@ void rtw_proc_init_one(struct net_device *dev)
- #endif
- 
- #ifdef DBG_MEMORY_LEAK
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_malloc_cnt, dev);				   
-+#else
-+	entry = proc_create_data("_malloc_cnt", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_malloc_cnt, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
-@@ -427,38 +500,60 @@ void rtw_proc_init_one(struct net_device *dev)
- #endif
- 
- #ifdef CONFIG_FIND_BEST_CHANNEL
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_best_channel, dev);				   
-+#else
-+	entry = proc_create_data("best_channel", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_best_channel, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_rx_signal, dev);				   
-+#else
-+	entry = proc_create_data("rx_signal", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_rx_signal, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry->write_proc = proc_set_rx_signal;
- 
- 	entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_ampdu_enable, dev);				   
-+#else
-+	entry = proc_create_data("ampdu_enable", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_ampdu_enable, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry->write_proc = proc_set_ampdu_enable;
- 
- 	entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO,
- 				   dir_dev, proc_get_rssi_disp, dev);				   
-+#else
-+	entry = proc_create_data("rssi_disp", S_IFREG | S_IRUGO,
-+				   dir_dev, proc_get_rssi_disp, dev);				   
-+#endif
- 	if (!entry) {
- 		DBG_871X("Unable to create_proc_read_entry!\n"); 
- 		return;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	entry->write_proc = proc_set_rssi_disp;
--
-+#endif
- }
- 
- void rtw_proc_remove_one(struct net_device *dev)
--- 
-1.8.1.6
-

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-003-linux-3.10-proc_create-2.patch

@@ -1,92 +0,0 @@
-From e30a6db935752679770b31668e899a7b77e1fec4 Mon Sep 17 00:00:00 2001
-From: kolasa <kkolasa@winsoft.pl>
-Date: Mon, 13 May 2013 11:43:03 +0200
-Subject: [PATCH] Usable /proc/net/rtl819xC/ver_info
-
----
- .../core/rtw_debug.c                                       |  9 +++++++++
- .../include/rtw_debug.h                                    |  5 ++++-
- .../os_dep/linux/os_intfs.c                                | 14 +++++++++++++-
- 3 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/core/rtw_debug.c b/core/rtw_debug.c
-index 04e472d..018fe48 100644
---- a/core/rtw_debug.c
-+++ b/core/rtw_debug.c
-@@ -62,6 +62,7 @@
- #ifdef CONFIG_PROC_DEBUG
- #include <rtw_version.h>
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) 
- int proc_get_drv_version(char *page, char **start,
- 			  off_t offset, int count,
- 			  int *eof, void *data)
-@@ -75,6 +76,14 @@ int proc_get_drv_version(char *page, char **start,
- 	*eof = 1;
- 	return len;
- }
-+#else
-+int proc_get_drv_version(struct seq_file *m, void* data)
-+{
-+	struct net_device *dev = data;
-+	
-+	return seq_printf(m, "%s\n", DRIVERVERSION); 
-+}
-+#endif
- 
- int proc_get_write_reg(char *page, char **start,
- 			  off_t offset, int count,
-diff --git a/include/rtw_debug.h b/include/rtw_debug.h
-index eca6692..5b3e5cc 100644
---- a/include/rtw_debug.h
-+++ b/include/rtw_debug.h
-@@ -285,10 +285,13 @@
- 
- #ifdef CONFIG_PROC_DEBUG
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	int proc_get_drv_version(char *page, char **start,
- 			  off_t offset, int count,
- 			  int *eof, void *data);
--
-+#else
-+	int proc_get_drv_version(struct seq_file *m, void *data);
-+#endif
- 	int proc_get_write_reg(char *page, char **start,
- 			  off_t offset, int count,
- 			  int *eof, void *data);
-diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
-index 99a5a1c..0e61bf9 100644
---- a/os_dep/linux/os_intfs.c
-+++ b/os_dep/linux/os_intfs.c
-@@ -255,6 +255,18 @@
- static struct proc_dir_entry *rtw_proc = NULL;
- static int	rtw_proc_cnt = 0;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+static int drv_version_proc_open(struct inode *inode, struct file *file){
-+        return single_open(file, proc_get_drv_version, NULL);
-+}
-+
-+static const struct file_operations drv_version_fops = {
-+        .open = drv_version_proc_open,
-+        .read = seq_read,
-+        .llseek = seq_lseek,
-+};
-+#endif
-+
- void rtw_proc_init_one(struct net_device *dev)
- {
- 	struct proc_dir_entry *dir_dev = NULL;
-@@ -289,7 +301,7 @@ void rtw_proc_init_one(struct net_device *dev)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 		entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);				   
- #else
--		entry = proc_create_data("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);				   
-+		entry = proc_create_data("ver_info", S_IFREG | S_IRUGO, rtw_proc, &drv_version_fops, dev);				   
- #endif
- 		if (!entry) {
- 			DBG_871X("Unable to create_proc_read_entry!\n"); 
--- 
-1.8.1.6
-

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch

@@ -1,7 +1,7 @@
-diff -Naur RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c
+diff -Naur RTL8192CU-v4.0.2_9000.20130911/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v4.0.2_9000.20130911.patch/hal/rtl8192c/usb/usb_halinit.c
---- RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c	2012-07-30 14:51:05.000000000 +0200
+--- RTL8192CU-v4.0.2_9000.20130911/hal/rtl8192c/usb/usb_halinit.c	2013-09-11 05:56:55.000000000 +0200
-+++ RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c	2013-03-19 16:51:48.251080509 +0100
++++ RTL8192CU-v4.0.2_9000.20130911.patch/hal/rtl8192c/usb/usb_halinit.c	2014-04-01 20:17:59.270739417 +0200
-@@ -3786,6 +3786,8 @@
+@@ -3509,6 +3509,8 @@
  				pHalData->CustomerID = RT_CID_DLINK;
  			else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a))
  				pHalData->CustomerID = RT_CID_DLINK;
@@ -10,14 +10,14 @@ diff -Naur RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c RTL8192
  			break;
  		case EEPROM_CID_WHQL:
  /*			
-diff -Naur RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c
+diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c
---- RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c	2012-07-30 14:51:05.000000000 +0200
+--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c	2013-09-11 05:56:55.000000000 +0200
-+++ RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c	2013-03-19 16:52:54.174644642 +0100
++++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c	2014-04-01 20:19:23.936708369 +0200
-@@ -137,6 +137,7 @@
+@@ -138,6 +138,7 @@
- 	{USB_DEVICE(0x2001, 0x3307)},//D-Link - Cameo
+ 	{USB_DEVICE(0x2001, 0x3307)},/* D-Link - Cameo */ \
- 	{USB_DEVICE(0x2001, 0x330A)},//D-Link - Alpha
+ 	{USB_DEVICE(0x2001, 0x330A)},/* D-Link - Alpha */ \
- 	{USB_DEVICE(0x2001, 0x3309)},//D-Link - Alpha
+ 	{USB_DEVICE(0x2001, 0x3309)},/* D-Link - Alpha */ \
-+	{USB_DEVICE(0x2001, 0x330D)},//D-Link - Alpha(?)
++	{USB_DEVICE(0x2001, 0x330D)},/* D-Link - Alpha(?)*/ \
- 	{USB_DEVICE(0x0586, 0x341F)},//Zyxel - Abocom
+ 	{USB_DEVICE(0x0586, 0x341F)},/* Zyxel - Abocom */ \
- 	{USB_DEVICE(0x7392, 0x7822)},//Edimax - Edimax
+ 	{USB_DEVICE(0x7392, 0x7822)},/* Edimax - Edimax */ \
- 	{USB_DEVICE(0x2019, 0xAB2B)},//Planex - Abocom
+ 	{USB_DEVICE(0x2019, 0xAB2B)},/* Planex - Abocom */ \

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_more_products.patch

@@ -1,13 +1,11 @@
-diff -Naur RTL8192CU-v3.4.3_4369.20120622/os_dep/linux/usb_intf.c RTL8192CU-v3.4.3_4369.20120622.patch/os_dep/linux/usb_intf.c
+diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c
---- RTL8192CU-v3.4.3_4369.20120622/os_dep/linux/usb_intf.c	2012-06-22 16:59:51.000000000 +0200
+--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c	2013-09-11 05:56:55.000000000 +0200
-+++ RTL8192CU-v3.4.3_4369.20120622.patch/os_dep/linux/usb_intf.c	2012-08-08 08:13:59.755932307 +0200
++++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c	2014-04-01 20:21:56.601914791 +0200
-@@ -99,7 +99,9 @@
+@@ -96,6 +96,7 @@
- 	{USB_DEVICE(0x2019, 0xED17)},//PCI - Edimax
+ 	{USB_DEVICE(0x2019, 0xED17)},/* PCI - Edimax */ \
- 	{USB_DEVICE(0x0DF6, 0x0052)},//Sitecom - Edimax
+ 	{USB_DEVICE(0x0DF6, 0x0052)},/* Sitecom - Edimax */ \
- 	{USB_DEVICE(0x7392, 0x7811)},//Edimax - Edimax
+ 	{USB_DEVICE(0x7392, 0x7811)},/* Edimax - Edimax */ \
-+	{USB_DEVICE(0x07B8, 0x8188)},//Abocom - Abocom
++	{USB_DEVICE(0x07B8, 0x8188)},/* Abocom - Abocom */ \
- 	{USB_DEVICE(0x07B8, 0x8189)},//Abocom - Abocom
+ 	{USB_DEVICE(0x07B8, 0x8189)},/* Abocom - Abocom */ \
-+	{USB_DEVICE(0x0846, 0x9041)},//NetGear WNA1000M
+ 	{USB_DEVICE(0x0EB0, 0x9071)},/* NO Brand - Etop */ \
- 	{USB_DEVICE(0x0EB0, 0x9071)},//NO Brand - Etop
+ 	{USB_DEVICE(0x06F8, 0xE033)},/* Hercules - Edimax */ \
- 	{USB_DEVICE(0x06F8, 0xE033)},//Hercules - Edimax
- 	{USB_DEVICE(0x103C, 0x1629)},//HP - Lite-On ,8188CUS Slim Combo

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-fix_310_proc2.patch

@@ -0,0 +1,29 @@
+--- a/os_dep/linux/os_intfs.c	2013-09-11 05:56:55.000000000 +0200
++++ b/os_dep/linux/os_intfs.c	2013-11-12 00:30:41.158248277 +0100
+@@ -277,6 +277,18 @@
+ 
+ #define RTW_PROC_NAME DRV_NAME
+ 
++#ifndef create_proc_entry
++/* dummy routines */
++void rtw_proc_remove_one(struct net_device *dev)
++{
++}
++
++void rtw_proc_init_one(struct net_device *dev)
++{
++}
++
++#else        /* create_proc_entry not defined */
++
+ void rtw_proc_init_one(struct net_device *dev)
+ {
+ 	struct proc_dir_entry *dir_dev = NULL;
+@@ -751,6 +763,7 @@
+ 		}
+ 	}
+ }
++#endif  /* create_proc_entry not defined */
+ #endif
+ 
+ uint loadparam( _adapter *padapter,  _nic_hdl	pnetdev);

packages/linux-drivers/RTL8192DU/package.mk

@@ -16,26 +16,36 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="dwm"
+PKG_NAME="RTL8192DU"
-PKG_VERSION="6.0"
+PKG_VERSION="085e206"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
+PKG_LICENSE="GPL"
-PKG_SITE="http://dwm.suckless.org/"
+PKG_SITE="https://github.com/lwfinger/rtl8192du"
-PKG_URL="http://dl.suckless.org/dwm/dwm-${PKG_VERSION}.tar.gz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libX11"
+PKG_DEPENDS_TARGET="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
-PKG_SECTION="x11/other"
+PKG_SECTION="driver"
-PKG_SHORTDESC="dwm: dynamic window manager for X"
+PKG_SHORTDESC="Realtek RTL8192DU Linux 3.x driver"
-PKG_LONGDESC="dwm is a dynamic window manager for X. It manages windows in tiled, monocle and floating layouts. All of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed"
+PKG_LONGDESC="Realtek RTL8192DU Linux 3.x driver"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
+pre_make_target() {
-  $MAKE LDFLAGS="$LDFLAGS -lX11" CFLAGS="$CFLAGS -std=c99" CC="$CC"
+  unset LDFLAGS
 }
 
-configure_target() {
+make_target() {
-  :
+  make V=1 \
+       ARCH=$TARGET_ARCH \
+       KSRC=$(kernel_path) \
+       CROSS_COMPILE=$TARGET_PREFIX \
+       CONFIG_POWER_SAVING=n
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
 }