config/version: set version to 4.0.0

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

CONTRIBUTING.md

@@ -35,12 +35,6 @@ Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
 particular feature into OpenELEC.
 
-Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver,
-we have no manpower to support a non-mainlined kernel driver for your hardware.
-However, OpenELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware
-is supported in mainline kernel, feel free to send us a Pull Request to enable it in our
-kernel defconfigs. We are always happy to support known-working hardware.
-
 ### Reporting build failures
 
 As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required

Makefile

@@ -11,12 +11,12 @@ release:
 image:
 	./scripts/image mkimage
 
+image-efi:
+	./scripts/image mkimage efi
+
 noobs:
 	./scripts/image noobs
 
-amlpkg:
-	./scripts/image amlpkg
-
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

README.md

@@ -2,8 +2,8 @@
 
 # OpenELEC - Open Embedded Linux Entertainment Center
 
-OpenELEC runs [Kodi](http://kodi.tv), an award-winning free and open source (GPL) software media 
-player and entertainment hub for digital media. For more info see http://kodi.tv .
+OpenELEC runs [XBMC](http://xbmc.org), an award-winning free and open source (GPL) software media 
+player and entertainment hub for digital media. For more info see http://xbmc.org .
 The base system has been designed and built from the ground up to be as 
 efficient as possible – consuming only tiny disk and memory footprints and
 providing cutting edge hardware support to deliver a set-top box experience.
@@ -16,6 +16,10 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 * Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
 
+**Known issues**
+
+* Testing snapshot
+
 **License**
 
 * OpenELEC is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). Please refer to the "licenses" folder and 
@@ -40,15 +44,16 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 **Features**
 
-* System size ~ 90 - 170MB
+* System size ~ 90 - 130MB
 * Minimal hardware requirements
 * Ultra fast boot
-* Simple configuration via Kodi itself
+* Optimized builds for platforms such as ION, Intel, Fusion
+* Simple configuration via XBMC itself
 * Plug and Play external storage
 
 **Software**
 
-* Kodi HTPC software – View/Manage all your media.
+* XBMC HTPC software – View/Manage all your media.
 * Samba server – File transfer from any PC client
 * SSH server – Remote console access for debugging
 * IR/Bluetooth Remote Control
@@ -59,16 +64,19 @@ 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).
 * Manual update/downgrade procedure is as follows:
-  Copy the snapshot (.tar) to the 'Update' network share (or /storage/.update) on
+  Extract the snapshot and navigate to the 'target' directory.
+  Copy KERNEL and SYSTEM along with KERNEL.md5 and SYSTEM.md5 to the 'Update' network share (or /storage/.update) on
   your openelec machine. Your system will automatically upgrade during the 
   next reboot.
 * Automatic mounting of filesystems is supported. Devices such as USB Flash 
   sticks can be plugged into a running machine and will be mounted to /media,
-  showing up in Kodi’s GUI.
+  showing up in xbmc’s GUI.
 * Comments and questions are more than welcome, help is even better and patches 
   are absolutely perfect!!
 

TODO

@@ -0,0 +1,8 @@
+ncurses-5.8/5.9:
+  - segfaults in nano and dialog -> using ncurses-5.7
+
+irserver:
+  - rework irserver/init.d for systemd
+
+settings addon:
+  - remove ps3 sleep? should be fixed in bluez 5.13/5.14

config/addon/addon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
+       name="@PKG_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
@@ -8,7 +8,9 @@
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
-  <extension point="xbmc.python.module" library="lib/">
+  <extension point="@PKG_ADDON_TYPE@"
+             library="default.py">
+        <provides>executable</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/addon/xbmc.python.script.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.script" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>

config/addon/xbmc.service.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>

config/arch.arm

@@ -32,9 +32,12 @@
       SIMD_SUPPORT="no"
       ;;
     cortex-a7|cortex-a15)
-      TARGET_SUBARCH=armv7ve
+      TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      # It's not currently possible to specify the exact architecture variant (-mcpu)
+      # that A7/A15 supports in the command line so use -mtune here.
+      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
+      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;

config/arch.i386

@@ -0,0 +1,14 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=i686
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=i686
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
+  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
+
+# build with SIMD support ( yes / no )
+  SIMD_SUPPORT="yes"

config/functions

@@ -1,9 +1,12 @@
 setup_toolchain() {
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
   if [ "$1" = target ]; then
     export DESTIMAGE="target"
 
-    unset CPP
-
     export CC=$TARGET_CC
     export CXX=$TARGET_CXX
     export LD=$TARGET_LD
@@ -28,8 +31,6 @@ setup_toolchain() {
   elif [ "$1" = host ]; then
     export DESTIMAGE="host"
 
-    unset CPP
-
     export AWK=$HOST_AWK
     export CC=$HOST_CC
     export CXX=$HOST_CXX
@@ -55,22 +56,12 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo ${PKG_VERSION}
 }
 
@@ -82,16 +73,10 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+    local _PKG_DIR=$(find $ROOT/packages -name $1)
+    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
       . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
     fi
-
     echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
   fi
 }
@@ -185,13 +170,14 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  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
+  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"`
 }
 
 strip_gold() {
@@ -277,12 +263,9 @@ dashes="==========================="
 }
 
 show_config() {
-  # load graphic configuration
-    get_graphicdrivers
-
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -307,24 +290,24 @@ show_config() {
   config_message="$config_message\n\n Graphic configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-    config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-    config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
-  fi
+  config_message="$config_message\n - XORG support:\t\t\t $XORG_SUPPORT"
+  config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
+  config_message="$config_message\n - XORG Xinerama support:\t\t $XINERAMA_SUPPORT"
+  config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
   config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
   config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
+  config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
 
   # Hardware decoder support
 
   config_message="$config_message\n\n Hardware decoder configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
-  config_message="$config_message\n - DCA decoder Support:\t\t\t $DCADEC_SUPPORT"
+  config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
+  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
+  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
 
   # Input device configuration
 
@@ -335,7 +318,7 @@ show_config() {
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -344,7 +327,9 @@ show_config() {
 
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
   config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
+  config_message="$config_message\n - Blu-Ray support:\t\t\t $BLURAY_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
+  config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
   config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
 
   for config_driver in $ADDITIONAL_DRIVERS; do
@@ -355,20 +340,22 @@ show_config() {
     config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
   done
 
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
   # Network service configuration
 
   config_message="$config_message\n\n Network service configuration:"
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
+  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
+  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -378,10 +365,10 @@ show_config() {
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
-    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
-  fi
+if [ "$BOOTLOADER" = "u-boot" ]; then
+  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
+  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
+fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
@@ -391,43 +378,31 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-  if [ "$SWAP_SUPPORT" = "yes" ]; then
-    config_message="$config_message\n   - Swapfile default size:\t\t $SWAPFILESIZE"
-  fi
+if [ "$SWAP_SUPPORT" = "yes" ]; then
+  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
+fi
   config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
-  # Kodi configuration
+  # XBMC configuration
 
-  config_message="$config_message\n\n Kodi configuration:"
+  config_message="$config_message\n\n XBMC configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
-  config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
-    config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
-    config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
-  fi
-  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi SSH client support:\t\t $KODI_SSHLIB_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
+  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
   done
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
+  config_message="$config_message\n - Include extra fonts:\t\t\t $XBMC_EXTRA_FONTS"
+  config_message="$config_message\n - Include RSXS Screensaver:\t\t $XBMC_SCR_RSXS"
+  config_message="$config_message\n - Include ProjectM Visualization:\t $XBMC_VIS_PROJECTM"
+  config_message="$config_message\n - Include Goom Visualization:\t\t $XBMC_VIS_GOOM"
 
   config_message="$config_message\n"
   config_message="$config_message\n $dashes$dashes$dashes"
@@ -435,5 +410,5 @@ show_config() {
   config_message="$config_message\n $dashes$dashes$dashes"
   config_message="$config_message\n\n\n"
 
-  echo -e "$config_message"
+  echo -e $config_message
 }

config/graphic

@@ -1,3 +1,9 @@
+if [ "$DISPLAYSERVER" = "x11" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
@@ -10,34 +16,62 @@ else
   OPENGLES_SUPPORT="yes"
 fi
 
+if [ "$SDL_SUPPORT" = no ]; then
+  JOYSTICK_SUPPORT="no"
+fi
+
+if [ "$OPENGL_SUPPORT" = no ]; then
+  XBMC_SCR_RSXS="no"
+  XBMC_VIS_PROJECTM="no"
+  XBMC_VIS_GOOM="no"
+fi
+
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "dove" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS dove"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      VAAPI_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"
-      VAAPI_SUPPORT="yes"
+      LIBVA="$LIBVA libva-driver-intel"
+    fi
+
+    if [ "$drv" = "nouveau" ]; then
+      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
+      DRI_DRIVERS="$DRI_DRIVERS"
+      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
+      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      COMPOSITE_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
     fi
 
     if [ "$drv" = "r200" ]; then
@@ -51,7 +85,6 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
@@ -59,7 +92,6 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "radeonsi" ]; then
@@ -67,7 +99,13 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
-      VDPAU_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/os.json

@@ -1,10 +1,7 @@
 {
-  "name": "@DISTRONAME@_@PROJECT@",
+  "name": "@DISTRONAME@",
   "version": "@OPENELEC_VERSION@",
   "release_date": "@RELEASE_DATE@",
   "kernel": "@KERNEL_VERSION@",
-  "description": "@DESCRIPTION@",
-  "username": "root",
-  "password": "@ROOT_PASSWORD@",
-  "supported_hex_revisions": "@NOOBS_HEX@"
+  "description": "@DESCRIPTION@"
 }

config/noobs/partition_setup.sh

@@ -40,7 +40,7 @@ md5sumCheck() {
   )
 }
 
-if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
   echo "error: part1, part2, id1 or id2 not specified"
   echo "actual values:"
   echo "part1:" $part1

config/noobs/partitions.json

@@ -1,7 +1,7 @@
 {
   "partitions": [
     {
-      "label":                     "@DISTRONAME@_@PROJECT@_System",
+      "label":                     "System",
       "filesystem_type":           "FAT",
       "partition_size_nominal":    160,
       "want_maximised":            false,
@@ -9,7 +9,7 @@
       "mkfs_options":              ""
     },
     {
-      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
+      "label":                     "Storage",
       "filesystem_type":           "ext4",
       "partition_size_nominal":    864,
       "want_maximised":            true,

config/optimize

@@ -30,7 +30,7 @@ fi
 TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

config/options

@@ -1,14 +1,6 @@
 # set default language for buildsystem
   export LC_ALL=C
 
-# determines DISTRO, if not forced by user
-# default is OpenELEC
-if [ -z "$DISTRO" ]; then
-  DISTRO="OpenELEC"
-else
-  DISTRO="$DISTRO"
-fi
-
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then
@@ -17,46 +9,36 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
-# default is x86_64
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
+# default is i386
 if [ -z "$ARCH" ]; then
-  TARGET_ARCH="x86_64"
+  TARGET_ARCH="i386"
 else
   TARGET_ARCH="$ARCH"
 fi
 
 ROOT=`pwd`
-DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
 LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
 
 # include versioning
   . config/version
 
-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
-
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
-
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $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`
 
-if [ -z "$LOCAL_CC" ] ; then
-  echo "***** Please install gcc *****"
-  exit 127
-fi
-
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
@@ -70,9 +52,7 @@ fi
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
-  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
-    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
-  fi
+  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -81,6 +61,9 @@ fi
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
+# forcing install of all packages (yes/no)
+  FORCE_INSTALL="no"
+
 # install devtools on development builds
   if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes
@@ -94,10 +77,5 @@ fi
     . $HOME/.openelec/$PROJECT/options
   fi
 
-# read distro options from $HOME if available
-  if [ -f "$HOME/.openelec/options.$DISTRO" ]; then
-    . $HOME/.openelec/options.$DISTRO
-  fi
-
 . config/graphic
 . config/path $1

config/path

@@ -20,14 +20,6 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
-if [ "$OPENELEC_VERSION" = "devel" ] ; then
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION
-fi
-
-if [ -n "$BUILD_SUFFIX" ]; then
-  BUILD=$BUILD-$BUILD_SUFFIX
-fi
-
 TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
@@ -72,46 +64,26 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=$(echo $1 | cut -d: -f1)
-    _ALL_DIRS=""
-    _FOUND=0
-    PKG_DIR=""
-
-    # first check project folder for a package
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
         PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
           echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
+          echo -e "$ALL_DIRS"
           exit 1
         fi
       fi
     done
-
-    # then check packages folder if not found already
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-        if [ -r "$DIR/package.mk" ]; then
-          # found first, set $PKG_DIR
-          PKG_DIR="$DIR"
-          # keep track of dirs with package.mk for detecting multiple folders
-          _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-          _FOUND=$((_FOUND+1))
-          if [ $_FOUND -gt 1 ]; then
-            # found more ? fail
-            echo "Error - multiple package folders:"
-            echo -e "$_ALL_DIRS"
-            exit 1
-          fi
-        fi
-      done
-    fi
   fi
 
   if [ -r $PKG_DIR/package.mk ]; then
@@ -131,13 +103,11 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-SSL_CERTIFICATES="/etc/ssl"
+SSL_CERTIFICATES="/etc/pki/tls"
 
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-unset TARGET_CPP
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -155,8 +125,6 @@ TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-unset HOST_CPP
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++

config/release/Autorun.inf

@@ -0,0 +1,2 @@
+[autorun]
+icon=openelec.ico

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="6.0.1"
+  OPENELEC_VERSION="4.0.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="6.0"
+  OS_VERSION="4.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="6.0"
+  ADDON_VERSION="4.1"
 

distributions/OpenELEC/options

@@ -1,200 +0,0 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
-
-# short project description
-  DESCRIPTION="OpenELEC is a fast and user-friendly Kodi Entertainment Center distribution."
-
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="#                  OpenELEC                  #"
-  GREETING2="#             http://openelec.tv             #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# Install glibc locales to the build (yes / no)
-  GLIBC_LOCALES="yes"
-
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
-
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
-
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
-
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8188EU RTL8812AU dvbhdhomerun"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
-
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
-
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
-
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

packages/3rdparty/lib/cxxtools/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -48,7 +48,6 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config
-
+  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
   rm -rf $INSTALL/usr/bin
 }

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

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

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch

@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+@DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile	Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile	Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+ 
+ ### The directory environment:
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch

@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_gateway.dpatch by Walter, dg9ep @ vdrportal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes problems when ending a telnet session with ctrl-c
+## DP: see: http://www.vdr-portal.de/board/thread.php?threadid=49680
+
+@DPATCH@
+diff -urNad vdr-plugin-control-0.0.2a~/gateway.c vdr-plugin-control-0.0.2a/gateway.c
+--- vdr-plugin-control-0.0.2a~/gateway.c	2004-07-02 21:24:22.000000000 +0200
++++ vdr-plugin-control-0.0.2a/gateway.c	2007-04-12 22:51:16.000000000 +0200
+@@ -36,7 +36,7 @@
+   _pTelnet	(0),
+   _pFormatter   (0)
+ {
+-  gl_CtrlGatewayCol.Add(this);
++//  gl_CtrlGatewayCol.Add(this);
+ 
+ //  if (! cKbdRemoteForControl::_pRemote)
+ //    cKbdRemoteForControl::_pRemote = new cKbdRemoteForControl();
+@@ -163,8 +163,8 @@
+ 
+ //  UnprepareSocket();
+ 
+-  if (! _terminating)
+-    gl_CtrlGatewayCol.Del(this);
++//  if (! _terminating)
++//    gl_CtrlGatewayCol.Del(this);
+ 
+   conDSYSLOG("gateway thread ended (pid=%d)", getpid());
+ conLOG_GATEW("gateway thread ended (pid=%d)", getpid());

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch

@@ -0,0 +1,35 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## control-1.3.18 patch - by Thomas G<>nther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.18.
+
+@DPATCH@
+--- control-0.0.2a/gateway.c
++++ control-0.0.2a/gateway.c
+@@ -102,7 +102,12 @@
+ 
+       uint64 Command = 0;
+       uint i = 0;
++#if VDRVERSNUM >= 10318
++      cTimeMs timeout;
++      timeout.Set(100);
++#else
+       int t0 = time_ms();
++#endif
+       while (_active && i < sizeof(Command)) {
+ 
+         uchar ch;
+@@ -131,7 +136,11 @@
+           // of their codes, so we'll need to wait some 100ms to see if
+           // there is more coming up - or whether this really is the 'ESC'
+           // key (if somebody knows how to clean this up, please let me know):
++#if VDRVERSNUM >= 10318
++          if (Command == 0x1B && !timeout.TimedOut())
++#else
+           if (Command == 0x1B && time_ms() - t0 < 100)
++#endif
+             continue;
+ 
+           if (Command) {

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch

@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_control-0.0.2a-1.5.0.dpatch by Thomas G<>nther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
+
+@DPATCH@
+--- control-0.0.2a/gateway.c
++++ control-0.0.2a/gateway.c
+@@ -100,7 +100,7 @@
+ 
+     if (_stack.poll(100)) {
+ 
+-      uint64 Command = 0;
++      uint64_t Command = 0;
+       uint i = 0;
+       int t0 = time_ms();
+       while (_active && i < sizeof(Command)) {
+--- control-0.0.2a/keyboard.c
++++ control-0.0.2a/keyboard.c
+@@ -18,7 +18,7 @@
+ 
+ struct tKbdMap {
+   eKbdFunc func;
+-  uint64 code;
++  uint64_t code;
+ };
+ 
+ 
+@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) {
++bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) {
+ 
+   bool ret = cRemote::Put(Command, Repeat, Release);
+ conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command);
+@@ -126,7 +126,7 @@
+ 
+ 
+ 
+-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) {
++bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) {
+ 
+   if (! _pRemote)
+     _pRemote = new cCtrlKeyboard();
+@@ -136,7 +136,7 @@
+ 
+ 
+ 
+-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) {
++int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) {
+ 
+   for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) {
+     if (p->code == Code)
+--- control-0.0.2a/keyboard.h
++++ control-0.0.2a/keyboard.h
+@@ -30,11 +30,11 @@
+   cCtrlKeyboard();
+   virtual ~cCtrlKeyboard();
+ 
+-  bool intPut(uint64 Command, bool Repeat, bool Release);
++  bool intPut(uint64_t Command, bool Repeat, bool Release);
+ 
+ public:
+-  static bool Put(uint64 Command, bool Repeat = false, bool Release = false);
+-  static int MapCodeToFunc(uint64 Code);
++  static bool Put(uint64_t Command, bool Repeat = false, bool Release = false);
++  static int MapCodeToFunc(uint64_t Code);
+ };
+ 
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch

@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_gcc-4.4.dpatch by Tobias Grimm <etobi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad vdr-plugin-control-0.0.2a~/formatter.c vdr-plugin-control-0.0.2a/formatter.c
+--- vdr-plugin-control-0.0.2a~/formatter.c	2004-07-02 21:24:22.000000000 +0200
++++ vdr-plugin-control-0.0.2a/formatter.c	2009-11-11 22:07:56.000000000 +0100
+@@ -165,7 +165,7 @@
+ 
+   if (Title) {
+ 
+-    char* t = strchr(Title, '\t');
++    const char* t = strchr(Title, '\t');
+     if (t) {
+ 
+       int size = t - Title;
+@@ -300,7 +300,7 @@
+ 
+   for (;;) {
+ 
+-    char* t = strchr(text, '\t');
++    const char* t = strchr(text, '\t');
+     if (t) {
+       // Tab found - check if the tab can be used
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch

@@ -0,0 +1,28 @@
+diff -Nru control-0.0.2a-kw3/control.c control-0.0.2a-kw3_0/control.c
+--- control-0.0.2a-kw3/control.c	2008-09-26 16:19:29.000000000 +0200
++++ control-0.0.2a-kw3_0/control.c	2012-08-04 12:17:08.000000000 +0200
+@@ -32,6 +32,7 @@
+ class cPluginControl : public cPlugin {
+ private:
+   // Add any member variables or functions you may need here.
++  cCtrlState* _pState;
+   cCtrlGateways* _pReceivers;
+   cCtrlGateway*  _pTerminal;
+ 
+@@ -67,6 +68,7 @@
+ cPluginControl::~cPluginControl()
+ {
+   // Clean up after yourself!
++  delete(_pState);
+   delete(_pReceivers);
+   delete(_pTerminal);
+ }
+@@ -120,7 +122,7 @@
+   // Start any background activities the plugin shall perform.
+ 
+   if (glParPort || glParTerminal && *glParTerminal)
+-    new cCtrlState();
++    _pState = new cCtrlState();
+ 
+   if (glParPort) {
+     _pReceivers = new cCtrlGateways();

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch

@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 65a7674..1a5976e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,7 @@ all: libvdr-$(PLUGIN).so
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

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

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="$DISTRO_MIRROR/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://phivdr.dyndns.org/vdr/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
@@ -33,23 +33,20 @@ PKG_LONGDESC="vdr dummydevice plugin"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
+  make VDRDIR=$VDR_DIR \
     LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+    LOCALEDIR="./locale"
 }
 
 post_make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME}
-
-  cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

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

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

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

@@ -33,24 +33,17 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

@@ -0,0 +1,68 @@
+diff --git a/Makefile b/Makefile
+index 6bb1b96..118e379 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,21 +62,10 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG   = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR   = $(call PKGCFG,libdir)
+-LOCDIR   = $(call PKGCFG,locdir)
+-MANDIR   = $(call PKGCFG,mandir)
+-CONFDIR  = $(call PKGCFG,configdir)
+-BINDIR   = $(call PKGCFG,bindir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
+-
+ ### configuring modules
+ ifeq ($(AUTOCONFIG),1)
+ 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
+@@ -92,9 +81,11 @@ ifeq ($(AUTOCONFIG),1)
+ 	endif
+ endif
+ 
++include $(VDRDIR)/Make.global
++
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -103,7 +94,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += 
+ 
+@@ -231,15 +222,19 @@ install-i18n: $(I18Nmsgs)
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN2).so: $(OBJS2)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN3).so: $(OBJS3)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN4).so: $(OBJS4)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ createcats: createcats.o Makefile
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,24 +33,17 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

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

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

@@ -34,9 +34,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CXXFLAGS="$CXXFLAGS -fPIC"
-  export LDFLAGS="$LDFLAGS -fPIC"
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 }
 
 pre_make_target() {

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

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="0489e01"
+PKG_VERSION="bf11f9e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
+PKG_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -33,6 +33,13 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+  export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+}
+
 pre_make_target() {
   # dont build parallel
   MAKEFLAGS=-j1
@@ -40,23 +47,11 @@ pre_make_target() {
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
+  make VDRDIR=$VDR_DIR \
+    VDRSRC=$VDR_DIR \
     LIBDIR="." \
-    LOCDIR="./locale" \
-    LIBDVBCSA=1 \
-    all install-i18n
-}
-
-post_make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+    LOCALEDIR="./locale" \
+    LIBDVBCSA=1
 }
 
 makeinstall_target() {

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

@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index efd124a..ed303fa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,22 +12,14 @@ PLUGIN = dvbapi
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+-GITTAG  = $(shell git describe --always 2>/dev/null)
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG  = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-LIBDIR  = $(call PKGCFG,libdir)
+-LOCDIR  = $(call PKGCFG,locdir)
+-PLGCFG  = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -35,7 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -122,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS) $(FFDECSA)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ ifndef LIBDVBCSA
+ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-03_ffdecsa.patch

@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 278af2b..996dc77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb
+ 
+ ifndef LIBDVBCSA
+ # FFdeCSA
+-PARALLEL   ?= PARALLEL_128_SSE2
+-CSAFLAGS   ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
++CPUOPT     ?= pentium
++PARALLEL   ?= PARALLEL_32_INT
++CSAFLAGS   ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+ FFDECSADIR  = FFdecsa
+ FFDECSA     = $(FFDECSADIR)/FFdecsa.o
+ DECSALIB    = $(FFDECSA)

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-eepg"
-PKG_VERSION="9cd9a75"
+PKG_VERSION="69b47ba"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,24 +33,17 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

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

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

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

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

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 90f3261..d80e15d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+diff --git a/client/Makefile b/client/Makefile
+index ea9dc45..6fac485 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -72,6 +72,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/server/Makefile b/server/Makefile
+index 37cd4bb..8d2f49f 100644
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -78,6 +78,7 @@ install-i18n: $(I18Nmsgs)
+ $(SOFILE): $(SERVEROBJS) $(COMMONOBJS) \
+ 	../tools/sockettools.a ../remux/remux.a ../libdvbmpeg/libdvbmpegtools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

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

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index d80e15d..ed2e168 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ INCLUDES += -I$(VDRDIR)/include -I..
+ export INCLUDES
+ 
+-DEFINES += -D_GNU_SOURCE
++DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifdef DEBUG
+ DEFINES += -DDEBUG

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

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="7c6ff30"
+PKG_VERSION="a3f7ac5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
+PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
@@ -30,26 +30,20 @@ PKG_SHORTDESC="TV"
 PKG_LONGDESC="TV"
 
 PKG_IS_ADDON="no"
+
 PKG_AUTORECONF="no"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
+  make VDRDIR=$VDR_DIR \
     LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
-}
-
-post_make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

@@ -0,0 +1,92 @@
+diff --git a/Makefile b/Makefile
+index 8f37c92..94869aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,30 +16,18 @@ VERSION = $(shell grep 'static const char \*VERSION *=' vnsi.h | awk '{ print $$
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR ?= $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
+-ifeq ($(strip $(APIVERSION)),)
+-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+-NOCONFIG := 1
+-endif
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ # backwards compatibility version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+ 
+ VDRSRC = $(VDRDIR)
+ VDRSRC ?= ../../..
+@@ -47,21 +35,8 @@ ifeq ($(strip $(LIBDIR)),)
+ LIBDIR = $(VDRSRC)/PLUGINS/lib
+ endif
+ 
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+ -include $(VDRSRC)/Make.global
+ -include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-else
+-
+-### Allow user defined options to overwrite defaults:
+-
+--include $(PLGCFG)
+-endif
+ 
+ ### The name of the distribution archive:
+ 
+@@ -74,11 +49,9 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG
+@@ -94,11 +67,7 @@ OBJS = vnsi.o bitstream.o vnsiclient.o config.o cxsocket.o parser.o parser_AAC.o
+ 
+ ### The main target:
+ 
+-ifdef API1733
+-all: install-lib
+-else
+ all: $(SOFILE)
+-endif
+ #
+ 
+ ### Implicit rules:
+@@ -145,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-xvdr/config/allowed_hosts.conf

@@ -0,0 +1,13 @@
+#
+# allowed_hosts.conf  This file describes a number of host addresses that
+#                     are allowed to connect to the streamdev server running 
+#                     with the Video Disk Recorder (VDR) on this system.
+# Syntax:
+#
+# IP-Address[/Netmask]
+#
+
+127.0.0.1             # always accept localhost
+192.168.0.0/24        # any host on the local net
+#204.152.189.113      # a specific host
+#0.0.0.0/0            # any host on any net (USE THIS WITH CARE!)

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

@@ -16,32 +16,36 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="jsoncpp"
-PKG_VERSION="src-0.5.0"
+PKG_NAME="vdr-plugin-xvdr"
+PKG_VERSION="7f49bfa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.kodi.tv"
-PKG_URL="http://sources.openelec.tv/mirror/jsoncpp/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
-PKG_SHORTDESC="jsoncpp"
-PKG_LONGDESC="jsoncpp"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
 
 PKG_IS_ADDON="no"
+
 PKG_AUTORECONF="no"
 
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-pre_build_target() {
-  cp $PKG_DIR/config/CMakeLists.txt $ROOT/$PKG_BUILD
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
-configure_target() {
-  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        ..
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
 }

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

@@ -0,0 +1,59 @@
+From 08b08a02a8e93e9b11594e2e846ec2b1a316d314 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 12 Feb 2014 20:32:03 +0200
+Subject: [PATCH] makefile
+
+---
+ Makefile |   15 ++++-----------
+ 1 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index da54323..81ba0e7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,23 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src -I./src/vdr
++INCLUDES += -I./src -I./src/vdr -I$(VDRDIR)/include
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+@@ -136,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+-- 
+1.7.2.5
+

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-satip"
-PKG_VERSION="2.2.3"
+PKG_VERSION="0.2.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,25 +33,18 @@ PKG_LONGDESC="vdr-satip is a SAT>IP plugin for VDR"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    SATIP_USE_TINYXML=1 \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    SATIP_USE_TINYXML=1 \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

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

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-wirbelscan"
-PKG_VERSION="0.0.9"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-receiver-api-fixes.patch

@@ -0,0 +1,51 @@
+commit 64f969e39d18aefa263dc3a61172e33df33963fb
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Thu Mar 29 20:22:11 2012 +0300
+
+    wirbelscan: receiver-api-fixes
+
+diff --git a/statemachine.c b/statemachine.c
+index 48a212e..bc0c8e5 100644
+--- a/statemachine.c
++++ b/statemachine.c
+@@ -36,12 +36,12 @@ protected:
+     while (Running()) cCondWait::SleepMs(5);
+     }; /*TODO: check here periodically for lock and wether we got any data!*/
+ public:
+-  cScanReceiver(tChannelID ChannelID, int AnyPid);
++  cScanReceiver(const cChannel* chan, int AnyPid);
+   virtual ~cScanReceiver() {cReceiver::Detach(); };
+   };
+ 
+-cScanReceiver::cScanReceiver(tChannelID ChannelID, int AnyPid) :
+-     cReceiver(ChannelID, 99, AnyPid), cThread("dummy receiver") { }
++cScanReceiver::cScanReceiver(const cChannel* chan, int AnyPid) :
++     cReceiver(chan, 99), cThread("dummy receiver") {  AddPid(AnyPid); }
+ 
+ ///!-----------------------------------------------------------------
+ ///!  v 0.0.5, store state in lastState if different and print state
+@@ -144,7 +144,7 @@ void cStateMachine::Action(void) {
+          ScannedTransponders.Add(ScannedTransponder);
+ 
+          dev->SwitchChannel(Transponder, false);
+-         aReceiver = new cScanReceiver(Transponder->GetChannelID(), 99);
++         aReceiver = new cScanReceiver(Transponder, 99);
+          dev->AttachReceiver(aReceiver);
+ 
+          cCondWait::SleepMs(1000);
+diff --git a/ttext.c b/ttext.c
+index 0053936..0864484 100644
+--- a/ttext.c
++++ b/ttext.c
+@@ -374,9 +374,9 @@ void cSwReceiver::Action() {
+      }
+ }
+ 
+-cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel->GetChannelID(),
+-   100, Channel->Tpid()), cThread("ttext") {
++cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel, 100), cThread("ttext") {
+ 
++   AddPid(Channel->Tpid());
+    stopped = fuzzy = false;
+    channel = Channel;
+    buffer  = new cRingBufferLinear(MEGABYTE(1),184);

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

@@ -18,12 +18,12 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.2.0"
+PKG_VERSION="2.1.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
@@ -55,7 +55,7 @@ EOF
 }
 
 make_target() {
-  make vdr vdr.pc
+  make vdr
   make include-dir
 }
 

packages/3rdparty/multimedia/vdr/patches/vdr-02_disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
+--- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
++++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
+@@ -146,7 +146,7 @@
+                if (Device) {
+                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                       const cChannel *Channel = ScanData->GetChannel();
+-                      if (Channel) {
++                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

packages/3rdparty/web/tntnet/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tntnet"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -50,9 +50,11 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
                            --with-ssl=no \
                            --with-stressjob=no"
 
-post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/tntnet-config
+pre_configure_target() {
+  strip_lto
+}
 
+post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share
 }

packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch

@@ -1,517 +0,0 @@
-diff -Naur tntnet-2.2.1/configure tntnet-2.2.1.patch/configure
---- tntnet-2.2.1/configure	2014-01-17 20:11:49.000000000 +0100
-+++ tntnet-2.2.1.patch/configure	2016-01-07 06:34:42.002634975 +0100
-@@ -16495,7 +16546,7 @@
- ac_config_files="$ac_config_files tntnet-config"
- 
- 
--ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
-+ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile pkgconfig/tntnet.pc pkgconfig/tntnet_sdk.pc sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -17642,6 +17693,8 @@
-     "framework/common/Makefile") CONFIG_FILES="$CONFIG_FILES framework/common/Makefile" ;;
-     "framework/runtime/Makefile") CONFIG_FILES="$CONFIG_FILES framework/runtime/Makefile" ;;
-     "framework/defcomp/Makefile") CONFIG_FILES="$CONFIG_FILES framework/defcomp/Makefile" ;;
-+    "pkgconfig/tntnet.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet.pc" ;;
-+    "pkgconfig/tntnet_sdk.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet_sdk.pc" ;;
-     "sdk/tools/common/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/common/Makefile" ;;
-     "sdk/tools/ecppc/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppc/Makefile" ;;
-     "sdk/tools/ecppl/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppl/Makefile" ;;
-diff -Naur tntnet-2.2.1/configure.in tntnet-2.2.1.patch/configure.in
---- tntnet-2.2.1/configure.in	2014-01-17 20:11:40.000000000 +0100
-+++ tntnet-2.2.1.patch/configure.in	2016-01-07 06:08:14.679087771 +0100
-@@ -218,6 +218,8 @@
-     framework/common/Makefile
-     framework/runtime/Makefile
-     framework/defcomp/Makefile
-+    pkgconfig/tntnet.pc
-+    pkgconfig/tntnet_sdk.pc
-     sdk/tools/common/Makefile
-     sdk/tools/ecppc/Makefile
-     sdk/tools/ecppl/Makefile
-diff -Naur tntnet-2.2.1/Makefile.am tntnet-2.2.1.patch/Makefile.am
---- tntnet-2.2.1/Makefile.am	2014-01-17 20:12:20.000000000 +0100
-+++ tntnet-2.2.1.patch/Makefile.am	2016-01-07 06:07:03.793973412 +0100
-@@ -80,3 +80,9 @@
-     Releasenotes-2.2.markdown \
-     Releasenotes-2.2.1.markdown \
-     $(pkgdata_SCRIPTS)
-+
-+pkgconfigdir = $(libdir)/pkgconfig/
-+
-+pkgconfig_DATA = \
-+    pkgconfig/tntnet.pc \
-+    pkgconfig/tntnet_sdk.pc
-diff -Naur tntnet-2.2.1/Makefile.in tntnet-2.2.1.patch/Makefile.in
---- tntnet-2.2.1/Makefile.in	2014-01-17 20:12:26.000000000 +0100
-+++ tntnet-2.2.1.patch/Makefile.in	2016-01-07 06:33:05.045478363 +0100
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.12.2 from Makefile.am.
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2012 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -14,24 +14,53 @@
- 
- @SET_MAKE@
- 
-+
- VPATH = @srcdir@
--am__make_dryrun = \
--  { \
--    am__dry=no; \
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+  case $${target_option-} in \
-+      ?) ;; \
-+      *) echo "am__make_running_with_option: internal error: invalid" \
-+              "target option '$${target_option-}' specified" >&2; \
-+         exit 1;; \
-+  esac; \
-+  has_opt=no; \
-+  sane_makeflags=$$MAKEFLAGS; \
-+  if $(am__is_gnu_make); then \
-+    sane_makeflags=$$MFLAGS; \
-+  else \
-     case $$MAKEFLAGS in \
-       *\\[\ \	]*) \
--        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
--          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
--      *) \
--        for am__flg in $$MAKEFLAGS; do \
--          case $$am__flg in \
--            *=*|--*) ;; \
--            *n*) am__dry=yes; break;; \
--          esac; \
--        done;; \
-+        bs=\\; \
-+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-     esac; \
--    test $$am__dry = yes; \
--  }
-+  fi; \
-+  skip_next=no; \
-+  strip_trailopt () \
-+  { \
-+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+  }; \
-+  for flg in $$sane_makeflags; do \
-+    test $$skip_next = yes && { skip_next=no; continue; }; \
-+    case $$flg in \
-+      *=*|--*) continue;; \
-+        -*I) strip_trailopt 'I'; skip_next=yes;; \
-+      -*I?*) strip_trailopt 'I';; \
-+        -*O) strip_trailopt 'O'; skip_next=yes;; \
-+      -*O?*) strip_trailopt 'O';; \
-+        -*l) strip_trailopt 'l'; skip_next=yes;; \
-+      -*l?*) strip_trailopt 'l';; \
-+      -[dEDm]) skip_next=yes;; \
-+      -[JT]) skip_next=yes;; \
-+    esac; \
-+    case $$flg in \
-+      *$$target_option*) has_opt=yes; break;; \
-+    esac; \
-+  done; \
-+  test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -52,11 +81,13 @@
- host_triplet = @host@
- target_triplet = @target@
- subdir = .
--DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
--	$(srcdir)/Makefile.in $(srcdir)/tntnet-config.in \
--	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
--	TODO config.guess config.sub depcomp install-sh ltmain.sh \
--	missing
-+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/configure $(am__configure_deps) \
-+	$(srcdir)/tntnet-config.in \
-+	$(top_srcdir)/pkgconfig/tntnet.pc.in \
-+	$(top_srcdir)/pkgconfig/tntnet_sdk.pc.in COPYING TODO \
-+	config.guess config.sub depcomp install-sh missing ltmain.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-@@ -71,7 +102,8 @@
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/framework/common/config.h
--CONFIG_CLEAN_FILES = tntnet-config
-+CONFIG_CLEAN_FILES = tntnet-config pkgconfig/tntnet.pc \
-+	pkgconfig/tntnet_sdk.pc
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -100,27 +132,62 @@
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \
-+	"$(DESTDIR)$(pkgconfigdir)"
- SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo "  GEN     " $@;
-+am__v_GEN_1 = 
-+AM_V_at = $(am__v_at_@AM_V@)
-+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-+am__v_at_0 = @
-+am__v_at_1 = 
- SOURCES =
- DIST_SOURCES =
--RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
--	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
-+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-+	ctags-recursive dvi-recursive html-recursive info-recursive \
-+	install-data-recursive install-dvi-recursive \
-+	install-exec-recursive install-html-recursive \
-+	install-info-recursive install-pdf-recursive \
-+	install-ps-recursive install-recursive installcheck-recursive \
-+	installdirs-recursive pdf-recursive ps-recursive \
-+	tags-recursive uninstall-recursive
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-     *) (install-info --version) >/dev/null 2>&1;; \
-   esac
-+DATA = $(pkgconfig_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
--AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
--	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+am__recursive_targets = \
-+  $(RECURSIVE_TARGETS) \
-+  $(RECURSIVE_CLEAN_TARGETS) \
-+  $(am__extra_recursive_targets)
-+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- 	cscope distdir dist dist-all distcheck
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-+# Read a list of newline-separated strings from the standard input,
-+# and print each of them once, without duplicates.  Input order is
-+# *not* preserved.
-+am__uniquify_input = $(AWK) '\
-+  BEGIN { nonempty = 0; } \
-+  { items[$$0] = 1; nonempty = 1; } \
-+  END { if (nonempty) { for (i in items) print i; }; } \
-+'
-+# Make sure the list of sources is unique.  This is necessary because,
-+# e.g., the same source file might be shared among _SOURCES variables
-+# for different programs/libraries.
-+am__define_uniq_tagged_files = \
-+  list='$(am__tagged_files)'; \
-+  unique=`for i in $$list; do \
-+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+  done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
-@@ -179,6 +246,7 @@
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AM_CFLAGS = @AM_CFLAGS@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -382,6 +450,11 @@
-     Releasenotes-2.2.1.markdown \
-     $(pkgdata_SCRIPTS)
- 
-+pkgconfigdir = $(libdir)/pkgconfig/
-+pkgconfig_DATA = \
-+    pkgconfig/tntnet.pc \
-+    pkgconfig/tntnet_sdk.pc
-+
- all: all-recursive
- 
- .SUFFIXES:
-@@ -421,6 +494,10 @@
- $(am__aclocal_m4_deps):
- tntnet-config: $(top_builddir)/config.status $(srcdir)/tntnet-config.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
-+pkgconfig/tntnet.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet.pc.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+pkgconfig/tntnet_sdk.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-@@ -500,6 +577,27 @@
- 
- distclean-libtool:
- 	-rm -f libtool config.lt
-+install-pkgconfigDATA: $(pkgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-+	if test -n "$$list"; then \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-+	fi; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-+	done
-+
-+uninstall-pkgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run 'make' without going through this Makefile.
-@@ -507,14 +605,13 @@
- # (1) if the variable is set in 'config.status', edit 'config.status'
- #     (which will cause the Makefiles to be regenerated when you run 'make');
- # (2) otherwise, pass the desired values on the 'make' command line.
--$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
--	@fail= failcom='exit 1'; \
--	for f in x $$MAKEFLAGS; do \
--	  case $$f in \
--	    *=* | --[!k]*);; \
--	    *k*) failcom='fail=yes';; \
--	  esac; \
--	done; \
-+$(am__recursive_targets):
-+	@fail=; \
-+	if $(am__make_keepgoing); then \
-+	  failcom='fail=yes'; \
-+	else \
-+	  failcom='exit 1'; \
-+	fi; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	case "$@" in \
-@@ -535,31 +632,13 @@
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
--tags-recursive:
--	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
--	done
--ctags-recursive:
--	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
--	done
--cscopelist-recursive:
--	list='$(SUBDIRS)'; for subdir in $$list; do \
--	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
--	done
- 
--ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
--	unique=`for i in $$list; do \
--	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	mkid -fID $$unique
--tags: TAGS
-+ID: $(am__tagged_files)
-+	$(am__define_uniq_tagged_files); mkid -fID $$unique
-+tags: tags-recursive
-+TAGS: tags
- 
--TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
--		$(TAGS_FILES) $(LISP)
-+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- 	set x; \
- 	here=`pwd`; \
- 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-@@ -575,12 +654,7 @@
- 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
--	unique=`for i in $$list; do \
--	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	$(am__define_uniq_tagged_files); \
- 	shift; \
- 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
-@@ -592,15 +666,11 @@
- 	      $$unique; \
- 	  fi; \
- 	fi
--ctags: CTAGS
--CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
--		$(TAGS_FILES) $(LISP)
--	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
--	unique=`for i in $$list; do \
--	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
--	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+ctags: ctags-recursive
-+
-+CTAGS: ctags
-+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+	$(am__define_uniq_tagged_files); \
- 	test -z "$(CTAGS_ARGS)$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- 	     $$unique
-@@ -609,18 +679,16 @@
- 	here=`$(am__cd) $(top_builddir) && pwd` \
- 	  && $(am__cd) $(top_srcdir) \
- 	  && gtags -i $(GTAGS_ARGS) "$$here"
--
- cscope: cscope.files
- 	test ! -s cscope.files \
- 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
--
- clean-cscope:
- 	-rm -f cscope.files
-+cscope.files: clean-cscope cscopelist
-+cscopelist: cscopelist-recursive
- 
--cscope.files: clean-cscope cscopelist-recursive cscopelist
--
--cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-+cscopelist-am: $(am__tagged_files)
-+	list='$(am__tagged_files)'; \
- 	case "$(srcdir)" in \
- 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- 	  *) sdir=$(subdir)/$(srcdir) ;; \
-@@ -754,9 +822,9 @@
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
--	chmod -R a-w $(distdir); chmod u+w $(distdir)
--	mkdir $(distdir)/_build
--	mkdir $(distdir)/_inst
-+	chmod -R a-w $(distdir)
-+	chmod u+w $(distdir)
-+	mkdir $(distdir)/_build $(distdir)/_inst
- 	chmod a-w $(distdir)
- 	test -d $(distdir)/_build || exit 0; \
- 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-@@ -820,10 +888,10 @@
- 	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(SCRIPTS)
-+all-am: Makefile $(SCRIPTS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
-@@ -878,7 +946,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgdataSCRIPTS
-+install-data-am: install-pkgconfigDATA install-pkgdataSCRIPTS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -924,30 +992,29 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS
-+uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA \
-+	uninstall-pkgdataSCRIPTS
-+
-+.MAKE: $(am__recursive_targets) install-am install-strip
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
--	cscopelist-recursive ctags-recursive install-am install-strip \
--	tags-recursive
--
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am am--refresh check check-am clean clean-cscope \
--	clean-generic clean-libtool cscope cscopelist \
--	cscopelist-recursive ctags ctags-recursive dist dist-all \
--	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
--	dist-zip distcheck distclean distclean-generic \
-+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-+	am--refresh check check-am clean clean-cscope clean-generic \
-+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-+	dist-xz dist-zip distcheck distclean distclean-generic \
- 	distclean-libtool distclean-tags distcleancheck distdir \
- 	distuninstallcheck dvi dvi-am html html-am info info-am \
- 	install install-am install-binSCRIPTS install-data \
- 	install-data-am install-dvi install-dvi-am install-exec \
- 	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-man install-pdf install-pdf-am \
--	install-pkgdataSCRIPTS install-ps install-ps-am install-strip \
--	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am \
--	uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS
-+	install-pkgconfigDATA install-pkgdataSCRIPTS install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-+	uninstall-am uninstall-binSCRIPTS uninstall-pkgconfigDATA \
-+	uninstall-pkgdataSCRIPTS
- 
- 
- tntnet-config: tntnet-config.in
-diff -Naur tntnet-2.2.1/pkgconfig/tntnet.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in
---- tntnet-2.2.1/pkgconfig/tntnet.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in	2016-01-07 06:07:03.794973414 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: tntnet
-+Description: Modular, multithreaded web application library for C++
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -ltntnet
-+Cflags: -I${includedir}
-+Requires.private: cxxtools
-diff -Naur tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in
---- tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in	2016-01-07 06:07:03.795973416 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: tntnet_sdk
-+Description: Helper library for ecpp-parsing programs
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -ltntnet_sdk
-+Cflags: -I${includedir}
-+Requires.private: cxxtools

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,11 +1,3 @@
-6.0.0
-  rebuild for OpenELEC-6.0
-4.3.2
-  allow running scripts from addon settings
-4.3.1
-  rebuild for addon api bump
-4.3.0
-  rebuild for addon api bump
 4.1.2
   clean up
 4.1.0

packages/addons/driver/hdhomerun/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="6.0"
-PKG_REV="0"
+PKG_VERSION="4.1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
@@ -31,8 +31,6 @@ PKG_LONGDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com).
 PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_ADDON_PROVIDES=""
-PKG_ADDON_REPOVERSION="6.0"
 
 make_target() {
   : # nothing to do here

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -32,8 +32,8 @@ unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFIL
 # exclusive lock
 exlock
 
-HDHR_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.hdhomerun"
-HDHR_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
 HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
 
 # modules are not automatically loaded

packages/addons/driver/hdhomerun/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -15,3 +15,18 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
+
+import os
+import sys
+import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
+__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'))
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_hdhomerun_tuners
+  refresh_hdhomerun_tuners(__settings_xml__)
+  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/actions.py

@@ -1,32 +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/>.
-################################################################################
-
-import os
-import sys
-import xbmcaddon
-
-__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
-__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'))
-
-if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
-  sys.path.append(__resources_lib__)
-  from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__)
-  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -24,7 +24,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom
 
-__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
 
 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist

packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py

@@ -37,39 +37,36 @@ def _usage(this_file):
     return """SYNOPSIS: pretty print an XML document
 USAGE: python %s <filename> \n""" % this_file
 
-def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
     if line.strip():
         start = ""
         number_chars = 0
         for l in range(indent_level):
             start = start + " "
             number_chars = number_chars + 1
-        if not ignore_contents:
-            try:
-                elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
-                elem_finished = _re.findall("([?|\]\]/|\-\-]*\>)", line)[0] 
-                #should not have *
-                attrs = _re.findall("(\S*?\=\".*?\")", line)
-                output.write(start + elem_start)
-                number_chars = len(start + elem_start)
-                for attr in attrs:
-                    if (attrs.index(attr) + 1) == len(attrs):
-                        number_chars = number_chars + len(elem_finished)
-                    if (number_chars + len(attr) + 1) > width:
-                        output.write("\n")
-                        for i in range(len(start + elem_start) + 1):
-                            output.write(" ")
-                        number_chars = len(start + elem_start) + 1 
-                    else:
+        try:
+            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
+            #should not have *
+            attrs = _re.findall("(\S*?\=\".*?\")", line)
+            output.write(start + elem_start)
+            number_chars = len(start + elem_start)
+            for attr in attrs:
+                if (attrs.index(attr) + 1) == len(attrs):
+                    number_chars = number_chars + len(elem_finished)
+                if (number_chars + len(attr) + 1) > width:
+                    output.write("\n")
+                    for i in range(len(start + elem_start) + 1):
                         output.write(" ")
-                        number_chars = number_chars + 1
-                    output.write(attr)
-                    number_chars = number_chars + len(attr)
-                output.write(elem_finished + "\n")
-            except IndexError:
-                #give up pretty print this line
-                output.write(start + line + "\n")
-        else:
+                    number_chars = len(start + elem_start) + 1 
+                else:
+                    output.write(" ")
+                    number_chars = number_chars + 1
+                output.write(attr)
+                number_chars = number_chars + len(attr)
+            output.write(elem_finished + "\n")
+        except IndexError:
+            #give up pretty print this line
             output.write(start + line + "\n")
                 
 
@@ -83,8 +80,7 @@ def _get_next_elem(data):
     start_pos = data.find("<")
     end_pos = data.find(">") + 1
     retval = data[start_pos:end_pos]
-    stopper = retval.rfind("/")
-    ignore_contents = False
+    stopper = retval.rfind("/") 
     if stopper < retval.rfind("\""):
         stopper = -1
     single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
@@ -93,19 +89,11 @@ def _get_next_elem(data):
     ignore_question =  retval.find("<?") > -1
 
     if ignore_excl:
-        ignore_contents = True
         cdata = retval.find("<![CDATA[") > -1
         if cdata:
             end_pos = data.find("]]>")
             if end_pos > -1:
                 end_pos = end_pos + len("]]>")
-                stopper = end_pos
-        else:
-            end_pos = data.find("-->")
-            if end_pos > -1:
-                end_pos = end_pos + len("-->")
-                stopper = end_pos
-        retval = data[start_pos:end_pos]
 
     elif ignore_question:
         end_pos = data.find("?>") + len("?>")
@@ -113,12 +101,11 @@ def _get_next_elem(data):
     
     no_indent = ignore or single
 
-    
+    #print retval, end_pos, start_pos, stopper > -1, no_indent
     return start_pos, \
            end_pos, \
            stopper > -1, \
-           no_indent, \
-           ignore_contents
+           no_indent
 
 def get_pprint(xml, indent=4, width=80):
     """Returns the pretty printed xml """
@@ -129,8 +116,6 @@ def get_pprint(xml, indent=4, width=80):
             self.output += string
     out = out()
     pprint(xml, output=out, indent=indent, width=width)
-    
-
 
     return out.output
 
@@ -141,7 +126,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
     Use indent to select indentation level. Default is 4   """
     data = xml
     indent_level = 0
-    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
     while ((start_pos > -1 and end_pos > -1)):
         _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                              output=output)
@@ -151,8 +136,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         _pprint_line(indent_level, 
                      data[:end_pos - start_pos], 
                      width=width,
-                     output=output,
-                     ignore_contents=ignore_contents)
+                     output=output)
         data = data[end_pos - start_pos:]
         if not is_stop and not no_indent :
             indent_level = indent_level + indent
@@ -160,7 +144,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         if not data:
             break
         else:
-            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
     
 
 if __name__ == "__main__":

packages/addons/driver/hdhomerun/source/resources/settings.xml

@@ -11,6 +11,6 @@
   <category label="9000">
     <setting type="sep" />
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
   </category>
 </settings>

packages/addons/driver/imon-mce/changelog.txt

@@ -1,24 +1,11 @@
-6.0.0
-  rebuild for OpenELEC-6.0
-
-4.3.1
- fix keymaps path
-
-4.3.0
- rebuild for addon api bump
-
 4.1.0
  rebuild for addon api bump
-
 4.0.1
  rebuild
-
 4.0.0
   rebuild for OpenELEC-4.0
-
 3.1.1
   rebuild for OpenELEC-3.2
-
 3.0.1
 - bump addon version
 

packages/addons/driver/imon-mce/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="imon-mce"
-PKG_VERSION="6.0"
+PKG_VERSION="4.1"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -31,8 +31,6 @@ PKG_LONGDESC="imon-mce is a driver to add support for MCE remotes to the imon dr
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
-PKG_ADDON_REPOVERSION="6.0"
 
 PKG_AUTORECONF="no"
 

packages/addons/driver/imon-mce/source/bin/imon-mce.service

@@ -21,4 +21,4 @@
 . /etc/profile
 
 sleep 1 && \
-ir-keytable -p rc6 -w /usr/lib/udev/rc_keymaps/imon_mce &
+ir-keytable -p rc6 -w /etc/rc_keymaps/imon_mce &

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

@@ -1,19 +1,3 @@
-6.0.1
-  update driver for new devices support
-6.0.0
-  rebuild for OpenELEC-6.0
-4.3.4
-  fixed xbmc/kodi rebranding error
-  some fixes
-4.3.3
-  addon transformed to service addon
-  new addon settings option to enable to check for new driver at boot
-4.3.2
-  new addon settings option to enable to update driver from web with latest version
-4.3.1
-  update driver
-4.3.0
-  rebuild for addon api bump
 4.1.5
   dont touch /storage/.profile
 4.1.4

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

@@ -17,28 +17,29 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="6.0"
-PKG_REV="1"
+PKG_VERSION="4.1"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET=""
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
 PKG_LONGDESC="Driver for Sundtek MediaTV Pro (DVB-C, DVB-T, AnalogTV, Composite, S-Video, FM-Radio USB Stick) and Sundtek SkyTV Ultimate (DVB-S/S2 USB)."
 PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
+PKG_ADDON_TYPE="xbmc.python.script"
 PKG_AUTORECONF="no"
-PKG_ADDON_REPOVERSION="6.0"
 
 make_target() {
   mkdir -p $ROOT/$PKG_BUILD
   cd $ROOT/$PKG_BUILD
 
   case $TARGET_ARCH in
+    i386)
+      INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
+      ;;
     x86_64)
       INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
       ;;
@@ -46,18 +47,11 @@ make_target() {
       INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
       ;;
   esac
-  
   wget -O installer.tar.gz $INSTALLER_URL
-  
   tar -xzf installer.tar.gz
-  
-  chmod -R 755 opt/ etc/
-  
-  rm -f  opt/bin/getinput.sh
-  rm -f  opt/bin/lirc.sh
-  rm -fr opt/lib/pm/
-
-  wget -O version.used http://sundtek.de/media/latest.phtml
+  # we run this via wrapper
+  mv opt/bin/mediaclient opt/bin/mediaclient.bin
+  chmod 755 opt/bin/*
 }
 
 makeinstall_target() {
@@ -70,5 +64,4 @@ addon() {
   cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
   cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/
   cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/
-  cp $PKG_BUILD/version.used $ADDON_BUILD/$PKG_ADDON_ID/
 }

packages/addons/driver/sundtek-mediatv/settings-default.xml

@@ -17,5 +17,4 @@
   <setting id="DEVICE4_NUM" value="1" />
   <setting id="DEVICE5_IP"  value="" />
   <setting id="DEVICE5_NUM" value="1" />
-  <setting id="CHECK_BOOT" value="false" />
 </settings>

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/sundtek-mediatv.start

@@ -1,247 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      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/>.
-################################################################################
-
-. /etc/profile
-
-net_tuner_num_fix() {
-  local num=$1
-
-  [ -z "$num" ] && num=1
-  num=$(( $num *1 ))
-  [ $num -lt 1 ] && num=1
-  num=$(( $num -1 ))
-  echo $num
-}
-
-SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-mkdir -p $SUNDTEK_ADDON_HOME
-
-if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
-  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
-else
-  # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
-  if [ -z "$entry_set" ]; then
-    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-
-    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
-fi
-
-if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
-  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
-fi
-
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
-
-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
-
-# check if there is new driver on web
-if [ "$CHECK_BOOT" = "true" ]; then
-  if [ ! -f /var/run/sundtek.checked ]; then
-    # only once after boot
-    touch /var/run/sundtek.checked
-
-(
-    # wait some time before checking
-    sleep 20
-    cd $SUNDTEK_ADDON_DIR
-
-    wget -O version.latest http://sundtek.de/media/latest.phtml
-
-    version_used=$(cat version.used)
-    version_latest=$(cat version.latest)
-    if [ "$version_used" != "$version_latest" ]; then
-      # new version exist
-      kodi-send -a "Notification(Sundtek, \"New driver version exist, update manually\", 4000, $SUNDTEK_ADDON_DIR/icon.png)"
-    fi
-)&
-  fi
-fi
-
-if [ -z "$(pidof mediasrv)" ]; then
-  rm -f /var/log/mediasrv.log
-  rm -f /var/log/mediaclient.log
-
-  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
-
-  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
-  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
-
-  # enable HW PID filter
-  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  # enable IR receiver
-  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
-    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ALLOW_NET_USE" = "true" ]; then
-    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
-  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
-  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
-  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
-  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
-  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
-  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
-  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
-  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
-  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
-
-  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-    # add entries
-    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
-    for dev in $(seq 0 $DEVICE1_NUM); do
-      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
-    done
-    if [ -n "$DEVICE2_IP" ]; then
-      for dev in $(seq 0 $DEVICE2_NUM); do
-        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
-      done
-      if [ -n "$DEVICE3_IP" ]; then
-        for dev in $(seq 0 $DEVICE3_NUM); do
-          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
-        done
-        if [ -n "$DEVICE4_IP" ]; then
-          for dev in $(seq 0 $DEVICE4_NUM); do
-            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
-          done
-          if [ -n "$DEVICE5_IP" ]; then
-            for dev in $(seq 0 $DEVICE5_NUM); do
-              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
-            done
-          fi
-        fi
-      fi
-    fi
-  else
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
-    # get tuner serial numbers
-    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
-    . /var/config/sundtek-addon.conf
-
-    for SERIAL in $SERIALS; do
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
-      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
-      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
-
-      if [ "$DVBMODE" = "DVB-T" ]; then
-        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
-        DVBMODE="DVBT"
-      else
-        DVBMODE=""
-      fi
-
-      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
-
-      [ ! -f $KEYMAP ] && KEYMAP=""
-
-      # remove setttings for this tuner
-      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
-      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
-      echo "" >>$SUNDTEK_CONF_TMP
-      # remove empty lines at the end of file
-      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-
-      ADDNEW=true
-      if [ -n "$DVBMODE" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$IRPROT" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$KEYMAP" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
-      fi
-
-      echo "" >>$SUNDTEK_CONF_TMP
-    done
-  fi
-
-  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
-  if [ "$md5_1" != "$md5_2" ]; then
-    # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
-
-  chmod +x $SUNDTEK_ADDON_DIR/bin/*
-  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
-
-  # wait few seconds
-  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
-  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
-  if [ $SETTLE_TIME -gt 0 ]; then
-    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
-    sleep $SETTLE_TIME
-  fi
-
-  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
-    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
-    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
-    sh /var/run/sundtek-userscript.sh
-  fi
-
-  # save adapter serial number
-  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
-  serial_number_new=$(mediaclient -e | awk '/device / {print $0} /SERIAL/ {id=1} /ID:/ {if (id==1) print $2}')
-  if [ "$serial_number_old" != "$serial_number_new" ]; then
-    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
-  fi
-fi
-
-logger -t Sundtek "### Sundtek ready ###"

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

@@ -1,117 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      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/>.
-################################################################################
-
-. /etc/profile
-
-SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-trap_exit_install() {
-  kodi-send -a "Notification(Sundtek, Something went wrong. Cleaning..., 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd "$SUNDTEK_ADDON_DIR"
-  rm -fr tmp
-  exit 5
-}
-
-# kill process
-systemctl stop driver.dvb.sundtek-mediatv
-killall -9 mediaclient &>/dev/null
-killall -9 mediasrv &>/dev/null
-
-# exit on errors
-set -e
-
-trap trap_exit_install EXIT
-
-cd "$SUNDTEK_ADDON_DIR"
-rm -fr tmp
-mkdir tmp
-cd tmp
-
-logger -t Sundtek "### Starting updating driver ###"
-kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-
-wget -O ../version.used http://sundtek.de/media/latest.phtml
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Can't get latest version ###"
-  kodi-send -a "Notification(Sundtek, Cant get latest version, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 1
-fi
-
-ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
-if [ "$ARCH" = "x86_64" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
-elif [ "$ARCH" = "arm" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
-else
-  logger -t Sundtek "### Unsupported architecture ###"
-  kodi-send -a "Notification(Sundtek, Unsupported architecture, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp
-  exit 2
-fi
-
-logger -t Sundtek "### Downloading driver archive for $ARCH ###"
-kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-wget -O installer.tar.gz $INSTALLER_URL
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Archive damaged ###"
-  kodi-send -a "Notification(Sundtek, Download failed, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 3
-fi
-
-logger -t Sundtek "### Extracting archive ###"
-kodi-send -a "Notification(Sundtek, Extracting archive, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
-tar -xzf installer.tar.gz
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Archive damaged ###"
-  kodi-send -a "Notification(Sundtek, Archive damaged, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
-  cd ..
-  rm -fr tmp/
-  exit 4
-fi
-
-# fix permissions
-chmod -R 755 opt/ etc/
-
-rm -f  opt/bin/getinput.sh
-rm -f  opt/bin/lirc.sh
-rm -fr opt/lib/pm/
-
-cp -Pa opt/bin/* ../bin/
-cp -Pa opt/lib/* ../lib/
-
-cd ..
-rm -fr tmp
-
-logger -t Sundtek "### Driver update finished ###"
-kodi-send -a "Notification(Sundtek, Driver update finished, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
-kodi-send -a "Notification(Sundtek, Please reboot, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
-
-trap - EXIT
-
-systemctl start driver.dvb.sundtek-mediatv
-
-exit 0