config/version: set version to 4.1.6

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:
-  - add package 'ppp'
-  - add package 'pptp'
+https://github.com/OpenELEC/OpenELEC.tv/commits/master
 
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
+To compare commits between versions use a formatted URL like:
 
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
+https://github.com/OpenELEC/OpenELEC.tv/compare/3.2.3...3.2.4
 
-Changed functions:
-
-Removed functions:
+If you have questions on differences between releases please ask them in the
+OpenELEC website forums or IRC support channel.

Makefile

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

README.md

@@ -64,8 +64,6 @@ providing cutting edge hardware support to deliver a set-top box experience.
   SSH allows command line access to your openelec.tv machine for configuration
   and file transfer. Linux/Mac clients can natively use SSH, while Windows
   users might want to try PuTTY for their terminal access.
-  Starting with OpenELEC 2.0, SSH is disabled by default but all that is needed
-  is an empty “ssh_enable” file to exist in /storage/.config to enable it.
 * $HOME is mounted on /storage (the second ext4 partition on the drive). 
   All data transfered to the machine will go here, the rest of the system is
   read-only with the exception of /var (containing runtime configuration data).

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/addon/addon.xml

@@ -12,6 +12,7 @@
              library="default.py">
         <provides>executable</provides>
   </extension>
+@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>

config/functions

@@ -1,9 +1,4 @@
 setup_toolchain() {
-  if [ "$1" = "--optimize" ]; then
-    OPTIMIZE=yes
-    shift
-  fi
-
   if [ "$1" = target ]; then
     export DESTIMAGE="target"
 
@@ -170,14 +165,13 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
-}
-
-strip_linker_plugin() {
-  # strip out usage from linker plugin
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
+  if [ -n "$GCC_OPTIM_LTO" ] ; then
+    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+  fi
+  if [ -n "$LD_OPTIM_LTO" ] ; then
+    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
+  fi
 }
 
 strip_gold() {

config/graphic

@@ -28,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -40,14 +40,12 @@ get_graphicdrivers() {
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -69,11 +67,6 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
     fi
 
-    if [ "$drv" = "virtualbox" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
-    fi
-
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
@@ -101,12 +94,5 @@ get_graphicdrivers() {
       COMPOSITE_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "vmware" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
-      XORG_DRIVERS="$XORG_DRIVERS vmware"
-#      LLVM_SUPPORT="yes"
-    fi
-
   done
 }

config/noobs/partitions.json

@@ -3,9 +3,9 @@
     {
       "label":                     "System",
       "filesystem_type":           "FAT",
-      "partition_size_nominal":    128,
+      "partition_size_nominal":    160,
       "want_maximised":            false,
-      "uncompressed_tarball_size": 110,
+      "uncompressed_tarball_size": 120,
       "mkfs_options":              ""
     },
     {

config/optimize

@@ -4,17 +4,17 @@ if [ "$OPTIMIZATIONS" = normal ];then
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="-Os -fexcess-precision=fast -ffast-math"
+  GCC_OPTIM="-Os -fexcess-precision=fast"
   LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then
-  GCC_OPTIM="$GCC_OPTIM -flto"
-  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin -flto"
+  GCC_OPTIM_LTO="-flto -ffat-lto-objects"
+  LD_OPTIM_LTO="-fuse-linker-plugin -flto"
 fi
 
 if [ "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+  LD_OPTIM_GOLD="-fuse-ld=gold"
 fi
 
 if [ "$DEBUG" = yes ]; then
@@ -28,9 +28,9 @@ else
 fi
 
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

config/options

@@ -29,12 +29,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
    . $PROJECT_DIR/$PROJECT/options
  fi
 
-# Target system library C (eglibc)
-  TARGET_LIBC="eglibc"
-
-# Library strip
-  LIBSTRIP="yes"
-
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`

config/path

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

config/version

@@ -1,8 +1,8 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.1.6"
 
 # OS_VERSION: OS Version
-  OS_VERSION="4.0"
+  OS_VERSION="4.2"
 
 # ADDON_VERSION: Addon version
   ADDON_VERSION="4.1"

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/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/3rdparty/web/tntnet/package.mk

@@ -50,10 +50,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
                            --with-ssl=no \
                            --with-stressjob=no"
 
-pre_configure_target() {
-  strip_lto
-}
-
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share

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/repository/repository.unofficial.addon.pro/package.mk

@@ -41,7 +41,7 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
   $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
      -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$ARCH|g" \
+     -e "s|@ARCH@|$TARGET_ARCH|g" \
   -i addon.xml
 }
 

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

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.4.27"
-PKG_REV="1"
+PKG_VERSION="3.9.1083"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
@@ -46,6 +46,8 @@ configure_target() {
             --enable-timeshift \
             --disable-libav \
             --disable-avahi \
+            --python=$ROOT/$TOOLCHAIN/bin/python \
+            --disable-uriparser \
             --enable-bundle
 }
 

packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch

@@ -0,0 +1,12 @@
+diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
+--- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
++++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
+@@ -28,7 +28,7 @@
+ #
+ 
+ CFLAGS  += -g -O2
+-CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
++CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
+ CFLAGS  += -Wmissing-prototypes
+ CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
+ CFLAGS  += -D_FILE_OFFSET_BITS=64

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

@@ -72,11 +72,9 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
   . $driver_dvb
 done
 
-# (wait for) at least 1 adapter (xbmc allows to set 0)
-[ $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/tvheadend/source/resources/settings.xml

@@ -14,7 +14,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
+		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
 		<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
     </category>

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

@@ -1,3 +1,29 @@
+4.1.7
+- add option to override epg charset
+- update to vdr-plugin-vnsiserver-7d4aa81
+- update to vdr-satip-0.3.3
+- update to vdr-plugin-eepg-d7dc614
+- update to vdr-plugin-dvbapi-bdcad3f
+- update to vdr-iptv-2.1.3
+
+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="7"
 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 $VDR_SC_DIR/systems/*/libsc*.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_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

@@ -76,13 +76,19 @@ if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
   fi
 fi
 
+if [ "$ENABLE_CHARSET_OVERRIDE" == "true" ] ; then
+  if [ ! -z "$CHARSET_OVERRIDE_STR" ] ; then
+    VDR_CHARSET_OVERRIDE="$CHARSET_OVERRIDE_STR"
+  fi
+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
-  VDR_ARG="$VDR_ARG -P iptv"
+  VDR_ARG="$VDR_ARG -P 'iptv -d $IPTV_NUM_DEVICES'"
 fi
 if [ "$ENABLE_STREAMDEV_SERVER" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P streamdev-server"
@@ -96,9 +102,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
@@ -120,6 +135,7 @@ VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
 
 cd $ADDON_DIR/config
 mkdir -p $ADDON_CONFIG_DIR
+mkdir -p "$VDR_VIDEO_DIR"
 
 for dir in `find . -type d`; do
   mkdir -p $ADDON_CONFIG_DIR/$dir
@@ -139,11 +155,9 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
   . $driver_dvb
 done
 
-# (wait for) at least 1 adapter (xbmc allows to set 0)
-[ $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
@@ -151,4 +165,4 @@ if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
 fi
 
 fix_config
-eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG
+eval LANG=en_US.UTF-8 VDR_CHARSET_OVERRIDE="$VDR_CHARSET_OVERRIDE" exec vdr.bin $VDR_ARG

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

@@ -7,24 +7,27 @@
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
 	<string id="1023">Number of adapters to wait for</string>
+	<string id="1024">Enable charset override</string>
+	<string id="1025">- charset</string>
 	<string id="1030">Plugin Configuration</string>
 	<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="1037">softcam plugin</string>
+	<string id="1036">Enable softcam (dvbapi)</string>
 	<string id="1038">Enable plugin: live</string>
-	<string id="1039">live: listen on ip</string>
-	<string id="1040">live: listen on port</string>
+	<string id="1039">- listen on ip</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>
+        <string id="1058">- number of devices</string>
 </strings>

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

@@ -4,8 +4,10 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
+		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+		<setting id="ENABLE_CHARSET_OVERRIDE" type="bool" label="1024" default="false" />
+		<setting id="CHARSET_OVERRIDE_STR" type="text" label="1025" visible="!eq(-1,false)" default="" />
     </category>
     <category label="1002">
 		<setting label="1051" type="lsep"/>
@@ -13,24 +15,27 @@
                 <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"/>
 		<setting type="sep" />
 		<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="vnsiserver" />
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
+		<setting id="IPTV_NUM_DEVICES" type="slider" option="int" range="1,4" label="1058" visible="!eq(-1,false)" default="1" />
 		<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_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>
+		<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="" 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,14 @@
     <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="" />
+    <setting id="ENABLE_CHARSET_OVERRIDE" value="false" />
+    <setting id="CHARSET_OVERRIDE_STR" value="" />
+    <setting id="IPTV_NUM_DEVICES" value="1" />
 </settings>

packages/audio/alsa-lib/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.0.27.2"
+PKG_VERSION="1.0.28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa-utils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.0.27.2"
+PKG_VERSION="1.0.28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -46,6 +46,11 @@ 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
+
+# remove default udev rule to restore mixer configs, we install our own.
+# so we avoid resetting our soundconfig
+  rm -rf $INSTALL/usr/lib/udev/rules.d/90-alsa-restore.rules
 
   for i in aconnect alsaucm amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do
     rm -rf $INSTALL/usr/bin/$i

packages/audio/alsa-utils/scripts/soundconfig

@@ -37,101 +37,95 @@ if [ -f $HOME/.config/sound.conf ]; then
 
 else
 
+# get card num
+  card=`echo $1 | sed 's/[^0-9]*//g'`
+
 # set common mixer params
-  mixer 0 Master 100%
-  mixer 0 Front 100%
-  mixer 0 PCM 100%
-  mixer 0 Synth 100%
+  mixer $card Master 100%
+  mixer $card Front 100%
+  mixer $card PCM 100%
+  mixer $card Synth 100%
 
 # mute CD, since using digital audio instead
-  mixer 0 CD 0% mute
+  mixer $card CD 0% mute
 
 # Only unmute Line and Aux if they are possibly used.
-#  mixer 0 Line 100%
-#  mixer 0 Aux 100%
+#  mixer $card Line 100%
+#  mixer $card Aux 100%
 
 # mute mic
-  mixer 0 Mic 0% mute
+  mixer $card Mic 0% mute
 
 # ESS 1969 chipset has 2 PCM channels
-  mixer 0 PCM,1 100%
+  mixer $card PCM,1 100%
 
 # Trident/YMFPCI/emu10k1
-  mixer 0 Wave 100%
-  mixer 0 Music 100%
-  mixer 0 AC97 100%
-  mixer 0 Surround 90%
-  mixer 0 'Surround Digital' 90%
-  mixer 0 'Wave Surround' 90%
-  mixer 0 'Duplicate Front' 90%
-  mixer 0 'Sigmatel 4-Speaker Stereo' 90%
+  mixer $card Wave 100%
+  mixer $card Music 100%
+  mixer $card AC97 100%
+  mixer $card Surround 90%
+  mixer $card 'Surround Digital' 90%
+  mixer $card 'Wave Surround' 90%
+  mixer $card 'Duplicate Front' 90%
+  mixer $card 'Sigmatel 4-Speaker Stereo' 90%
 
 # CS4237B chipset:
-  mixer 0 'Master Digital' 100%
+  mixer $card 'Master Digital' 100%
 
 # DRC
-  mixer 0 'Dynamic Range Compression' 90%
+  mixer $card 'Dynamic Range Compression' 90%
 
 # Envy24 chips with analog outs
-  mixer 0 DAC 100%
-  mixer 0 DAC,0 100%
-  mixer 0 DAC,1 100%
+  mixer $card DAC 100%
+  mixer $card DAC,0 100%
+  mixer $card DAC,1 100%
 
 # some notebooks use headphone instead of master
-  mixer 0 Headphone 100%
-  mixer 0 Speaker 100%
-  mixer 0 'Internal Speaker' 0% mute
-  mixer 0 Playback 100%
-  mixer 1 Headphone 100%
-  mixer 1 Speaker 100%
-
-  mixer 0 Center 100%
-  mixer 0 LFE 100%
-  mixer 0 Center/LFE 100%
+  mixer $card Headphone 100%
+  mixer $card Speaker 100%
+  mixer $card 'Internal Speaker' 0% mute
+  mixer $card Playback 100%
+  mixer $card Headphone 100%
+  mixer $card Speaker 100%
+  mixer $card Center 100%
+  mixer $card LFE 100%
+  mixer $card Center/LFE 100%
 
 # Intel P4P800-MX  (Ubuntu bug #5813)
-  mixer 0 'Master Playback Switch' on
+  mixer $card 'Master Playback Switch' on
 
 # set digital output mixer params
-  mixer 0 'IEC958' 100% on
-  mixer 0 'IEC958 Output' 100%
-  mixer 0 'IEC958 Coaxial' 100%
-  mixer 0 'IEC958 LiveDrive' 100%
-  mixer 0 'IEC958 Optical Raw' 100%
-  mixer 0 'SPDIF Out' 100%
-  mixer 0 'SPDIF Front' 100%
-  mixer 0 'SPDIF Rear' 100%
-  mixer 0 'SPDIF Center/LFE' 100%
-  mixer 0 'Master Digital' 100%
+  mixer $card 'IEC958' 100% on
+  mixer $card 'IEC958 Output' 100%
+  mixer $card 'IEC958 Coaxial' 100%
+  mixer $card 'IEC958 LiveDrive' 100%
+  mixer $card 'IEC958 Optical Raw' 100%
+  mixer $card 'SPDIF Out' 100%
+  mixer $card 'SPDIF Front' 100%
+  mixer $card 'SPDIF Rear' 100%
+  mixer $card 'SPDIF Center/LFE' 100%
+  mixer $card 'Master Digital' 100%
 
-  mixer 0 'Analog Front' 100%
-  mixer 0 'Analog Rear' 100%
-  mixer 0 'Analog Center/LFE' 100%
+  mixer $card 'Analog Front' 100%
+  mixer $card 'Analog Rear' 100%
+  mixer $card 'Analog Center/LFE' 100%
 
 # ASRock ION 330 (and perhaps others) has 2 IEC958 channels
-  mixer 0 IEC958,0 on
-  mixer 0 IEC958,1 on
+  mixer $card IEC958,0 on
+  mixer $card IEC958,1 on
 
 # some ION2 has much more IEC958 channels ...
-  mixer 0 IEC958,2 on
-  mixer 0 IEC958,3 on
-
-# ... or "simply" more soundchips
-  mixer 1 IEC958,0 on
-  mixer 1 IEC958,1 on
-  mixer 1 IEC958,2 on
-  mixer 1 IEC958,3 on
+  mixer $card IEC958,2 on
+  mixer $card IEC958,3 on
 
 # ASRock ION 330 has Master Front set to 0
-  mixer 0 'Master Front' 100%
+  mixer $card 'Master Front' 100%
 
 # Shuttle XS35GT needs this too
-  mixer 0 'Master',0 100% on
+  mixer $card 'Master',0 100% on
 
 # and this for various Fusion devices like Zotac ZBOX
-  mixer 1 'Master',0 100% on
-  mixer 1 'Front',0 100% on
-
+  mixer $card 'Front',0 100% on
 fi
 
 exit 0

packages/audio/alsa-utils/udev.d/90-alsa-restore.rules

@@ -17,4 +17,4 @@
 ################################################################################
 
 # When a sound device is detected, restore the volume settings
-  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig"
+  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig %k"

packages/audio/espeak/package.mk

@@ -16,27 +16,38 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="speedcontrol"
-PKG_VERSION="1"
+PKG_NAME="espeak"
+PKG_VERSION="1.48.04-source"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://noto.de"
-PKG_URL=""
+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="system"
-PKG_SHORTDESC="speedcontrol: a tool to setup cdrom drive speed"
-PKG_LONGDESC="speedcontrol is a tool to setup cdrom drive speed"
+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() {
-  $CC $CFLAGS $LDFLAGS -o $PKG_NAME $PKG_NAME.c
+  make -C src \
+       CXXFLAGS="$CXXFLAGS" \
+       LDFLAGS="$LDFLAGS" \
+       AUDIO=""
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_NAME $INSTALL/usr/bin
+  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,10 +43,11 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
                            --with-ogg=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
-pre_make_target() {
-  # hack
-  cp -R ../doc/* ./doc
-}
+if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse"
+else
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
+fi
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin

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/lame/package.mk

@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-nasm \
+PKG_CONFIGURE_OPTS_TARGET="--disable-nasm \
                            --disable-rpath \
                            --disable-cpml \
                            --disable-gtktest \

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"
@@ -44,11 +44,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
                            --disable-vcd-info \
                            --without-cd-drive \
                            --without-cd-info \
-                           --with-cd-paranoia \
                            --without-cdda-player \
                            --without-cd-read \
                            --without-iso-info \
                            --without-iso-read \
+                           --without-libiconv-prefix \
                            --with-gnu-ld"
 
 pre_configure_target() {

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

@@ -22,7 +22,7 @@ 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="http://taglib.github.io/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -34,9 +34,15 @@ PKG_AUTORECONF="no"
 
 # package specific configure options
 configure_target() {
-  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_STATIC=1 ..
 }
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
+  # pkgconf hack
+  $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
 }

packages/compress/lzo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="lzo"
-PKG_VERSION="2.06"
+PKG_VERSION="2.08"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,4 +33,5 @@ PKG_LONGDESC="LZO is a data compression library which is suitable for data de-/c
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

packages/compress/zlib/package.mk

@@ -25,7 +25,6 @@ PKG_SITE="http://www.zlib.net"
 PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST=""
-PKG_DEPENDS_INIT="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="compress"
 PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
@@ -36,7 +35,6 @@ PKG_AUTORECONF="no"
 
 TARGET_CONFIGURE_OPTS="--prefix=/usr"
 HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN"
-INIT_CONFIGURE_OPTS="--prefix=/"
 
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
@@ -47,8 +45,3 @@ pre_build_host() {
   mkdir -p $PKG_BUILD/.$HOST_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
 }
-
-pre_build_init() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME-init
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME-init
-}

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-3080600"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/debug/gdb/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.7"
+PKG_VERSION="7.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/gdb/"
-PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib ncurses expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/debug/strace/patches/strace-4.8-autoreconf.patch

@@ -1,13 +0,0 @@
-diff -Naur strace-4.8/configure.ac strace-4.8.patch/configure.ac
---- strace-4.8/configure.ac	2013-05-04 21:51:57.000000000 +0200
-+++ strace-4.8.patch/configure.ac	2013-09-04 03:30:12.478057723 +0200
-@@ -1,8 +1,6 @@
- dnl Process this file with autoconf to create configure.  Use autoreconf.
- AC_PREREQ(2.57)
--AC_INIT([strace],
--	m4_esyscmd([./git-version-gen .tarball-version]),
--	[strace-devel@lists.sourceforge.net])
-+AC_INIT([strace],[4.8])
- AC_CONFIG_SRCDIR([strace.c])
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_HEADERS([config.h])

packages/debug/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch

@@ -1,99 +0,0 @@
-From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001
-From: Ali Polatel <alip at exherbo.org>
-Date: Tue, 24 Sep 2013 20:04:32 +0300
-Subject: [PATCH 01/29] Work around conflict between <sys/ptrace.h> and
- <linux/ptrace.h>
-
-Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
-which collides with <linux/ptrace.h>.
-
-* configure.ac: Check for `struct ptrace_peeksiginfo_args' in <sys/ptrace.h>.
-* process.c: Work around potential conflict between <sys/ptrace.h>
-and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
-* signal.c: Likewise.
-* syscall.c: Likewise.
-* util.c: Likewise.
-
-Signed-off-by: Ali Polatel <alip at exherbo.org>
----
-
-diff --git a/configure.ac b/configure.ac
-index f19e4f2..aa4923a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
- 
- AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
- 
--AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
-+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,
- 	       [#include <sys/ptrace.h>])
- 
- AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
-diff --git a/process.c b/process.c
-index 1a2181b..59428a4 100644
---- a/process.c
-+++ b/process.c
-@@ -63,7 +63,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/signal.c b/signal.c
-index 7fb9abf..3411ddd 100644
---- a/signal.c
-+++ b/signal.c
-@@ -51,7 +51,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/syscall.c b/syscall.c
-index 83a95bd..3477dcd 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -48,7 +48,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/util.c b/util.c
-index 0dab902..30a7f19 100644
---- a/util.c
-+++ b/util.c
-@@ -55,7 +55,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
--- 
-1.8.3.2
-

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/autoconf-2.64/package.mk

@@ -1,62 +0,0 @@
-################################################################################
-#      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="autoconf-2.64"
-PKG_VERSION="legacy"
-PKG_SOURCE_DIR="$PKG_NAME"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://sources.redhat.com/autoconf/"
-PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
-PKG_SOURCE_DIR="$PKG_NAME"
-PKG_DEPENDS_HOST="ccache:host m4:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
-PKG_LONGDESC="Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-PKG_CONFIGURE_OPTS_HOST="EMACS=no \
-                         ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
-                         ac_cv_prog_gnu_m4_gnu=no \
-                         --target=$TARGET_NAME \
-                         --program-suffix=-2.64"
-
-make_host() {
- : # nothing todo
-}
-
-makeinstall_host() {
-  make install \
-       prefix=$ROOT/$TOOLCHAIN \
-       pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
-       pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
-       pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
-       install
-
-  make clean
-  make install \
-       prefix=$SYSROOT_PREFIX/usr \
-       pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
-       pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
-       pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
-       install
-}

packages/devel/autoconf-2.68/package.mk

@@ -1,62 +0,0 @@
-################################################################################
-#      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="autoconf-2.68"
-PKG_VERSION="legacy"
-PKG_SOURCE_DIR="$PKG_NAME"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://sources.redhat.com/autoconf/"
-PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
-PKG_SOURCE_DIR="$PKG_NAME"
-PKG_DEPENDS_HOST="ccache:host m4:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
-PKG_LONGDESC="Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-PKG_CONFIGURE_OPTS_HOST="EMACS=no \
-                         ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
-                         ac_cv_prog_gnu_m4_gnu=no \
-                         --target=$TARGET_NAME \
-                         --program-suffix=-2.68"
-
-make_host() {
- : # nothing todo
-}
-
-makeinstall_host() {
-  make install \
-       prefix=$ROOT/$TOOLCHAIN \
-       pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
-       pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
-       pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
-       install
-
-  make clean
-  make install \
-       prefix=$SYSROOT_PREFIX/usr \
-       pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
-       pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
-       pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
-       install
-}

packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch

@@ -0,0 +1,139 @@
+Upstream-Status: Pending
+
+Index: autoconf-2.63/bin/autoreconf.in
+===================================================================
+--- autoconf-2.63.orig/bin/autoreconf.in	2008-12-31 17:39:01.000000000 +0000
++++ autoconf-2.63/bin/autoreconf.in	2008-12-31 17:43:38.000000000 +0000
+@@ -76,6 +76,7 @@
+   -i, --install            copy missing auxiliary files
+       --no-recursive       don't rebuild sub-packages
+   -s, --symlink            with -i, install symbolic links instead of copies
++  -x, --exclude=STEPS      steps we should not run
+   -m, --make               when applicable, re-run ./configure && make
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
+ 
+@@ -136,6 +137,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+ 
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines.  ##
+ ## ---------- ##
+@@ -153,6 +161,7 @@
+ 	  'B|prepend-include=s'	 => \@prepend_include,
+ 	  'i|install'            => \$install,
+ 	  's|symlink'            => \$symlink,
++  	  'x|exclude=s'          => \@exclude,
+ 	  'm|make'               => \$run_make,
+ 	  'recursive!'           => \$recursive);
+ 
+@@ -162,6 +171,8 @@
+   parse_WARNINGS;
+   parse_warnings '--warnings', @warning;
+ 
++  @exclude = map { split /,/ } @exclude;
++
+   # Even if the user specified a configure.ac, trim to get the
+   # directory, and look for configure.ac again.  Because (i) the code
+   # is simpler, and (ii) we are still able to diagnose simultaneous
+@@ -255,6 +266,11 @@
+ {
+   my ($aclocal, $flags) = @_;
+ 
++  @ex = grep (/^aclocal$/, @exclude);
++  if ($#ex != -1) {
++    return;
++  }
++
+   # aclocal 1.8+ does all this for free.  It can be recognized by its
+   # --force support.
+   if ($aclocal_supports_force)
+@@ -368,7 +384,10 @@
+     }
+   else
+     {
+-      xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      }
+     }
+ 
+ 
+@@ -532,16 +551,17 @@
+ 	{
+ 	  $libtoolize .= " --ltdl";
+ 	}
+-      xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
+-      $rerun_aclocal = 1;
++      @ex = grep (/^libtoolize$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
++        $rerun_aclocal = 1;
++      }
+     }
+   else
+     {
+       verb "$configure_ac: not running libtoolize: --install not given";
+     }
+ 
+-
+-
+   # ------------------- #
+   # Rerunning aclocal.  #
+   # ------------------- #
+@@ -572,7 +592,10 @@
+   # latter runs the former, and (ii) autoconf is stricter than
+   # autoheader.  So all in all, autoconf should give better error
+   # messages.
+-  xsystem ($autoconf);
++  @ex = grep (/^autoconf$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$autoconf");
++  }
+ 
+ 
+   # -------------------- #
+@@ -593,7 +616,10 @@
+     }
+   else
+     {
+-      xsystem ($autoheader);
++      @ex = grep (/^autoheader$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autoheader");
++      }
+     }
+ 
+ 
+@@ -610,7 +636,10 @@
+       # We should always run automake, and let it decide whether it shall
+       # update the file or not.  In fact, the effect of `$force' is already
+       # included in `$automake' via `--no-force'.
+-      xsystem ($automake);
++      @ex = grep (/^automake$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$automake");
++      }
+     }
+ 
+ 
+@@ -634,7 +663,10 @@
+ 	    }
+ 	  else
+ 	    {
+-	      xsystem ("$make");
++              @ex = grep (/^make$/, @exclude);
++              if ($#ex == -1) {
++	        xsystem ("$make");
++              }
+ 	    }
+ 	}
+     }

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/automake/patches/automake-01-fix-help2man.patch

@@ -0,0 +1,25 @@
+From fc19cd1da6161ec5602e692488dfc8e670797afe Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Fri, 15 Aug 2014 22:10:03 +0300
+Subject: [PATCH] meh help2man
+
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5a336df..2d2029b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -701,7 +701,7 @@ update_mans = \
+   $(AM_V_GEN): \
+     && $(MKDIR_P) doc \
+     && $(extend_PATH) \
+-    && $(PERL) $(srcdir)/doc/help2man --output=$@
++    && $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr
+ 
+ amhello_sources = \
+   doc/amhello/configure.ac \
+-- 
+1.7.2.5
+

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"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
@@ -40,16 +40,12 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --with-sysroot=$SYSROOT_PREFIX \
                          --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \
-                         --with-gmp=$ROOT/$TOOLCHAIN \
-                         --with-mpfr=$ROOT/$TOOLCHAIN \
-                         --with-ppl=$ROOT/$TOOLCHAIN \
-                         --with-cloog=$ROOT/$TOOLCHAIN \
+                         --without-ppl \
+                         --without-cloog \
                          --disable-werror \
                          --disable-multilib \
                          --disable-libada \
                          --disable-libssp \
-                         --disable-ppl-version-check \
-                         --enable-cloog-backend=isl \
                          --enable-version-specific-runtime-libs \
                          --enable-plugins \
                          --enable-gold \
@@ -57,10 +53,6 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-lto \
                          --disable-nls"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-64-bit-bfd"
-fi
-
 pre_configure_host() {
   unset CPPFLAGS
   unset CFLAGS

packages/devel/binutils/patches/binutils-2.23.1-cloog-0.17.patch

@@ -1,25 +0,0 @@
-diff -Naur binutils-2.22/configure binutils-2.22.patch/configure
---- binutils-2.22/configure	2011-08-14 14:28:15.000000000 +0200
-+++ binutils-2.22.patch/configure	2012-05-08 05:57:26.093455382 +0200
-@@ -5946,8 +5946,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 18
-     choke me
-    #endif
-   ;
-diff -Naur binutils-2.22/configure.ac binutils-2.22.patch/configure.ac
---- binutils-2.22/configure.ac	2011-11-21 12:58:27.000000000 +0100
-+++ binutils-2.22.patch/configure.ac	2012-05-08 05:54:27.974921129 +0200
-@@ -1589,7 +1589,7 @@
-   dnl
-   dnl If we use CLooG-Legacy, the provided version information is
-   dnl ignored.
--  CLOOG_CHECK_VERSION(0,16,1)
-+  CLOOG_CHECK_VERSION(0,18,0)
- 
-   dnl Only execute fail-action, if CLooG has been requested.
-   CLOOG_IF_FAILED([

packages/devel/boost/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_55_0"
+PKG_VERSION="1_56_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.boost.org/"
-PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.55.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.56.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2"
@@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_host() {
-  cd tools/build/v2/engine
+  cd tools/build/src/engine
     sh build.sh
 }
 
@@ -59,7 +59,7 @@ configure_target() {
                   --with-python=$ROOT/$TOOLCHAIN/bin/python \
 
   echo "using gcc : `$TARGET_CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $TARGET_CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
-    > tools/build/v2/user-config.jam
+    > tools/build/src/user-config.jam
 }
 
 make_target() {
@@ -69,6 +69,7 @@ make_target() {
 makeinstall_target() {
   $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
                                 --prefix=$SYSROOT_PREFIX/usr \
+				--ignore-site-config \
                                   --layout=system \
                                   --with-thread \
                                   --with-iostreams \

packages/devel/cloog/package.mk

@@ -1,44 +0,0 @@
-################################################################################
-#      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="cloog"
-PKG_VERSION="0.18.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.cloog.org/"
-PKG_URL="http://www.bastoul.net/cloog/pages/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host gmp:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/math"
-PKG_SHORTDESC="cloog: a free software and library to generate code for scanning Z-polyhedra."
-PKG_LONGDESC="CLooG is a library to generate code for scanning Z-polyhedra. In other words, it finds code that reaches each integral point of one or more parameterized polyhedra. GCC links with this library in order to enable the new loop generation code known as Graphite."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-# TODO: automake 1.13 support must be fixed
-
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
-                         --enable-shared \
-                         --disable-static \
-                         --disable-silent-rules \
-                         --with-gnu-ld \
-                         --with-isl=buildin \
-                         --with-gmp=system \
-                         --with-gmp-prefix=$ROOT/$TOOLCHAIN"

packages/devel/cloog/patches/cloog-0.18.0-automake.patch

@@ -1,12 +0,0 @@
-diff -Naur cloog-0.17.0/Makefile.am cloog-0.17.0.patch/Makefile.am
---- cloog-0.17.0/Makefile.am	2011-12-08 12:03:08.000000000 +0100
-+++ cloog-0.17.0.patch/Makefile.am	2012-06-13 14:05:03.611679108 +0200
-@@ -145,7 +145,7 @@
- 	examples
- 
- install-data-local:
--	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
-+	@test -z "$(pkgconfig_libdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfig_libdir)"
- 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
- 
- uninstall-local:

packages/devel/cmake/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="2.8.12.1"
+PKG_VERSION="3.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
@@ -33,15 +33,13 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_host() {
-  ../configure --no-qt-gui
+  ../configure --prefix=$ROOT/$TOOLCHAIN \
+               --no-qt-gui \
+               -- \
+               -DBUILD_CursesDialog=0
 }
 
-makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cmake $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cpack $ROOT/$TOOLCHAIN/bin
-    cp -P bin/ctest $ROOT/$TOOLCHAIN/bin
-
+post_makeinstall_host() {
   mkdir -p $ROOT/$TOOLCHAIN/etc
 
   cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF

packages/devel/dbus-glib/package.mk

@@ -17,14 +17,13 @@
 ################################################################################
 
 PKG_NAME="dbus-glib"
-PKG_VERSION="0.100.2"
+PKG_VERSION="0.102"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL="http://dbus.freedesktop.org/releases/dbus-glib/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="glib:host dbus:host"
-PKG_DEPENDS_TARGET="toolchain dbus glib expat dbus-glib:host"
+PKG_DEPENDS_TARGET="toolchain dbus glib expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"
@@ -40,13 +39,11 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \
                            --disable-shared \
                            --disable-tests \
                            --disable-bash-completion \
-                           --enable-asserts=no \
-                           --with-introspect-xml=$PKG_BUILD/.$HOST_NAME/introspect.xml \
-                           --with-dbus-binding-tool=$ROOT/$TOOLCHAIN/bin/dbus-binding-tool"
+                           --enable-asserts=no"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-tests \
-                         --disable-bash-completion \
-                         --enable-asserts=yes"
+pre_configure_target() {
+  CFLAGS="$CFLAGS -fPIC -DPIC"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/dbus-binding-tool

packages/devel/dbus-glib/patches/dbus-glib-0.100-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur dbus-glib-0.100-old/configure.ac dbus-glib-0.100-new/configure.ac
---- dbus-glib-0.100-old/configure.ac	2012-06-25 09:26:39.000000000 -0700
-+++ dbus-glib-0.100-new/configure.ac	2012-12-29 08:54:04.000000000 -0800
-@@ -8,7 +8,7 @@
- 
- AM_INIT_AUTOMAKE([1.9])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch

@@ -0,0 +1,38 @@
+From a45f914870e923741f3123799bd9e126b5da4aa0 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 22:43:28 +0300
+Subject: [PATCH] dont build tools / examples
+
+---
+ Makefile.am      |    4 ++--
+ dbus/Makefile.am |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dd76c7e..78cb56f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ ACLOCAL_AMFLAGS = -I m4
+ GLIB_PC=dbus-glib-1.pc
+ 
+-SUBDIRS=dbus tools test doc
+-DIST_SUBDIRS=dbus tools test doc m4
++SUBDIRS=dbus test doc
++DIST_SUBDIRS=dbus test doc m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = $(GLIB_PC)
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 6d885f9..8bc102d 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)						\
+-- 
+1.7.2.5
+

packages/devel/elfutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="elfutils"
-PKG_VERSION="0.155"
+PKG_VERSION="0.159"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -32,16 +32,15 @@ PKG_LONGDESC="Elfutils is a collection of utilities, including eu-ld (a linker),
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
+PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
+                           --disable-werror \
                            --disable-progs \
+                           --disable-nls \
                            --with-zlib \
                            --without-bzlib \
                            --without-lzma"
 
 pre_configure_target() {
-# elfutils fails to build with LTO support
-  strip_lto
-
   export CFLAGS="$CFLAGS -fPIC -DPIC"
 }
 

packages/devel/elfutils/patches/bk/elfutils-02-argp-support.patch

@@ -1,92 +0,0 @@
-Allow the usage of an external implementation of the argp functions
-
-uClibc lack the argp family of functions that glibc has. Therefore, we
-add a check in the configure script to see if argp_parse is available
-in the C library. If not, we look if it is available in the additional
-'argp' library. If so, we link against that library. If not, we error
-out.
-
-This allows to build elfutils against uClibc with an external argp
-library.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -269,6 +269,13 @@
- 	enable_progs=yes)
- AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
- 
-+AC_CHECK_FUNC([argp_parse])
-+if test "$ac_cv_func_argp_parse" != yes; then
-+   AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
-+		AC_MSG_ERROR([No argp_parse function available.]))
-+fi
-+AC_SUBST(ARGP_LIBS)
-+
- dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
- dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
- save_LIBS="$LIBS"
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -98,26 +98,29 @@
- # Buggy old compilers.
- readelf_no_Werror = yes
- 
--readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
-+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
-+	$(ARGP_LIBS)
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
--	   $(demanglelib)
--size_LDADD = $(libelf) $(libeu) $(libmudflap)
--strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
--ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
-+	   $(demanglelib) $(ARGP_LIBS)
-+size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
-+strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
-+ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
- if NATIVE_LD
- # -ldl is always needed for libebl.
- ld_LDADD += libld_elf.a
- endif
- ld_LDFLAGS = -rdynamic
--elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
--findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
--addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
--elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
--objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
--ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
--strings_LDADD = $(libelf) $(libeu) $(libmudflap)
--ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
--unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
-+elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
-+findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
-+addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
-+elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS)
-+objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
-+	$(ARGP_LIBS)
-+ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
-+strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
-+ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
-+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \
-+	$(ARGP_LIBS)
- 
- ldlex.o: ldscript.c
- ldlex_no_Werror = yes
-Index: b/libdw/Makefile.am
-===================================================================
---- a/libdw/Makefile.am
-+++ b/libdw/Makefile.am
-@@ -111,7 +111,7 @@
- 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- 		-Wl,--version-script,$<,--no-undefined \
- 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--		-ldl $(zip_LIBS)
-+		-ldl $(zip_LIBS) $(ARGP_LIBS)
- 	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 

packages/devel/elfutils/patches/bk/elfutils-03-memcpy-def.patch

@@ -1,24 +0,0 @@
-Provide a compatibility alias __memcpy
-
-For some reason, libelf uses the internal glibc alias __memcpy, which
-doesn't exist in uClibc. Add a manual alias so that the build can
-proceed with uClibc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libelf/libelf.h
-===================================================================
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -34,6 +34,11 @@
- /* Get the ELF types.  */
- #include <elf.h>
- 
-+#ifndef _LIBC
-+#ifndef __mempcpy
-+#define __mempcpy mempcpy
-+#endif
-+#endif
- 
- /* Known translation types.  */
- typedef enum

packages/devel/elfutils/patches/elfutils-no_textrel_check.patch

@@ -1,77 +0,0 @@
-diff -Naur elfutils-0.155/libasm/Makefile.am elfutils-0.155.patch/libasm/Makefile.am
---- elfutils-0.155/libasm/Makefile.am	2012-08-27 20:27:31.000000000 +0200
-+++ elfutils-0.155.patch/libasm/Makefile.am	2013-03-05 18:11:43.841545009 +0100
-@@ -69,7 +69,6 @@
- 		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
- 		-Wl,--soname,$@.$(VERSION) \
- 		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libasm.so
-diff -Naur elfutils-0.155/libasm/Makefile.in elfutils-0.155.patch/libasm/Makefile.in
---- elfutils-0.155/libasm/Makefile.in	2012-08-27 20:29:45.000000000 +0200
-+++ elfutils-0.155.patch/libasm/Makefile.in	2013-03-05 18:12:05.604432305 +0100
-@@ -654,7 +654,6 @@
- @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION) \
- @MUDFLAP_FALSE@		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libasm.so
-diff -Naur elfutils-0.155/libdw/Makefile.am elfutils-0.155.patch/libdw/Makefile.am
---- elfutils-0.155/libdw/Makefile.am	2012-08-27 20:27:31.000000000 +0200
-+++ elfutils-0.155.patch/libdw/Makefile.am	2013-03-05 18:12:26.753322780 +0100
-@@ -112,7 +112,6 @@
- 		-Wl,--version-script,$<,--no-undefined \
- 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- 		-ldl $(zip_LIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libdw.so
-diff -Naur elfutils-0.155/libdw/Makefile.in elfutils-0.155.patch/libdw/Makefile.in
---- elfutils-0.155/libdw/Makefile.in	2012-08-27 20:29:45.000000000 +0200
-+++ elfutils-0.155.patch/libdw/Makefile.in	2013-03-05 18:12:41.272246520 +0100
-@@ -844,7 +844,6 @@
- @MUDFLAP_FALSE@		-Wl,--version-script,$<,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- @MUDFLAP_FALSE@		-ldl $(zip_LIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libdw.so
-diff -Naur elfutils-0.155/libelf/Makefile.am elfutils-0.155.patch/libelf/Makefile.am
---- elfutils-0.155/libelf/Makefile.am	2012-08-27 20:27:31.000000000 +0200
-+++ elfutils-0.155.patch/libelf/Makefile.am	2013-03-05 18:13:23.328024851 +0100
-@@ -106,7 +106,6 @@
- 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- 		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
- 		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libelf.so
-diff -Naur elfutils-0.155/libelf/Makefile.in elfutils-0.155.patch/libelf/Makefile.in
---- elfutils-0.155/libelf/Makefile.in	2012-08-27 20:29:45.000000000 +0200
-+++ elfutils-0.155.patch/libelf/Makefile.in	2013-03-05 18:13:37.270951393 +0100
-@@ -830,7 +830,6 @@
- @MUDFLAP_FALSE@	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libelf.so
-diff -Naur elfutils-0.155/src/Makefile.in elfutils-0.155.patch/src/Makefile.in
---- elfutils-0.155/src/Makefile.in	2012-08-27 20:29:46.000000000 +0200
-+++ elfutils-0.155.patch/src/Makefile.in	2013-03-05 18:14:22.361713943 +0100
-@@ -867,7 +867,6 @@
- @NATIVE_LD_FALSE@	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- @NATIVE_LD_FALSE@		$(libelf) $(libeu) \
- @NATIVE_LD_FALSE@		-Wl,--version-script,$(srcdir)/libld_elf_i386.map
--@NATIVE_LD_FALSE@	$(textrel_check)
- 
- # Special rule to make it possible to define libld_elf_a_SOURCES as we do.
- # Otherwise make would complain.

packages/devel/elfutils/patches/elfutils-only_libdw_libelf.patch

@@ -1,26 +0,0 @@
-diff -Naur elfutils-0.155/Makefile.am elfutils-0.155.patch/Makefile.am
---- elfutils-0.155/Makefile.am	2012-08-27 20:27:31.000000000 +0200
-+++ elfutils-0.155.patch/Makefile.am	2013-03-05 18:38:47.565095550 +0100
-@@ -23,8 +23,7 @@
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests
-+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
-diff -Naur elfutils-0.155/Makefile.in elfutils-0.155.patch/Makefile.in
---- elfutils-0.155/Makefile.in	2012-08-27 20:29:45.000000000 +0200
-+++ elfutils-0.155.patch/Makefile.in	2013-03-05 18:39:11.176974119 +0100
-@@ -256,8 +256,7 @@
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests
-+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3

packages/devel/file/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.16"
+PKG_VERSION="5.19"
 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"
@@ -32,7 +32,7 @@ PKG_LONGDESC="flex is a tool for generating programs that perform pattern-matchi
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
 
 post_makeinstall_host() {
   cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"

packages/devel/gettext/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.18.3.1"
+PKG_VERSION="0.19.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -32,9 +32,14 @@ PKG_LONGDESC="This is the GNU gettext package. It is interesting for authors or
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+PKG_CONFIGURE_SCRIPT="gettext-tools/configure"
+
 PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
                          --disable-rpath \
                          --with-gnu-ld \
                          --disable-java \
+                         --disable-curses \
+                         --with-included-libxml \
                          --disable-native-java \
+                         --disable-csharp \
                          --without-emacs"

packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch

@@ -0,0 +1,24 @@
+diff -Naur gettext-0.19.1/gettext-tools/Makefile.am gettext-0.19.1.patch/gettext-tools/Makefile.am
+--- gettext-0.19.1/gettext-tools/Makefile.am	2014-05-01 11:37:33.000000000 +0200
++++ gettext-0.19.1.patch/gettext-tools/Makefile.am	2014-06-23 16:06:15.225426222 +0200
+@@ -19,7 +19,7 @@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+ 
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
+ 
+ EXTRA_DIST = misc/DISCLAIM
+ MOSTLYCLEANFILES = core *.stackdump
+diff -Naur gettext-0.19.1/gettext-tools/Makefile.in gettext-0.19.1.patch/gettext-tools/Makefile.in
+--- gettext-0.19.1/gettext-tools/Makefile.in	2014-06-10 07:42:48.000000000 +0200
++++ gettext-0.19.1.patch/gettext-tools/Makefile.in	2014-06-23 16:06:32.453461116 +0200
+@@ -1556,7 +1556,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 

packages/devel/glib/package.mk

@@ -17,14 +17,13 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.34.3"
+PKG_VERSION="2.40.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="ccache:host libffi:host libxml2:host zlib:host Python:host"
-PKG_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python:host"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.40/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"
@@ -33,15 +32,6 @@ PKG_LONGDESC="GLib is a library which includes support routines for C such as li
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld \
-                         --with-libiconv=no \
-                         --enable-debug=no \
-                         --disable-man \
-                         --disable-dtrace \
-                         --disable-systemtap \
-                         --disable-rebuilds \
-                         --disable-gtk-doc"
-
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            ac_cv_func_posix_getpwuid_r=yes \
                            ac_cv_func_posix_getgrgid_r=yes \
@@ -54,40 +44,16 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            --disable-selinux \
                            --disable-fam \
                            --enable-xattr \
+                           --disable-libelf \
                            --disable-gtk-doc \
                            --disable-man \
                            --disable-dtrace \
                            --disable-systemtap \
-                           --disable-gcov \
                            --enable-Bsymbolic \
                            --with-gnu-ld \
                            --with-threads=posix \
                            --with-pcre=system"
 
-pre_build_host() {
-  # hack: we need pkg.m4 for autoreconf, but pkgconfig depends on glib so install
-  # pkg.m4 first
-  $SCRIPTS/unpack pkg-config
-  cp $BUILD/pkg-config-*/pkg.m4 $TOOLCHAIN/share/aclocal
-}
-
-pre_configure_host() {
-  export ZLIB_CFLAGS=""
-  export ZLIB_LIBS=""
-  export LIBFFI_CFLAGS="-I$ROOT/$TOOLCHAIN/include/libffi"
-  export LIBFFI_LIBS="-L$ROOT/$TOOLCHAIN/lib -lffi"
-}
-
-pre_configure_target() {
-  # glib segfaults with LTO optimization
-  strip_lto
-}
-
-post_makeinstall_host() {
-  cp -f gobject/.libs/glib-genmarshal $ROOT/$TOOLCHAIN/bin
-  cp -f gobject/glib-mkenums $ROOT/$TOOLCHAIN/bin
-}
-
 post_makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
     cp g*-2.0.pc $SYSROOT_PREFIX/usr/lib/pkgconfig

packages/devel/glib/patches/glib-01-dont-build-tests.patch

@@ -0,0 +1,54 @@
+From 68cbd635036fe04cd07bbb1a4829eebab2d7dc03 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 22:46:35 +0300
+Subject: [PATCH] dont build tests
+
+---
+ Makefile.am  |    2 +-
+ configure.ac |   17 -----------------
+ 2 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 40e5cd5..db7bfc8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
+ 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
+ 
+ bin_SCRIPTS = glib-gettextize
+diff --git a/configure.ac b/configure.ac
+index a01e58d..f310615 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2559,23 +2559,6 @@ dnl ******************************************************************
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-AS_IF([ test $cross_compiling = yes ], [
+-  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
+-  if test x$GLIB_GENMARSHAL = xno; then
+-    AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
+-  fi
+-
+-  AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
+-  if test x$GLIB_COMPILE_SCHEMAS = xno; then
+-    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
+-  fi
+-
+-  AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
+-  if test x$GLIB_COMPILE_RESOURCES = xno; then
+-    AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
+-  fi
+-])
+-
+ dnl **************************
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+-- 
+1.7.2.5
+

packages/devel/glib/patches/glib-2.34.3-automake_1.13.patch

@@ -1,11 +0,0 @@
-diff -Naur glib-2.34.3-old/configure.ac glib-2.34.3-new/configure.ac
---- glib-2.34.3-old/configure.ac	2012-12-29 06:22:04.000000000 -0800
-+++ glib-2.34.3-new/configure.ac	2012-12-29 06:22:28.000000000 -0800
-@@ -293,7 +293,6 @@
- 
- AC_HEADER_STDC
- 
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
-