Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/lib/cxxtools/install

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1

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

@@ -1,3 +1,6 @@
+3.0.9
+- rebuild
+
 3.0.8
 - vdr-plugin-xmltv2vdr: use VDR_CACHE_DIR for epg.db
 - use own /var/run/vdr tmpfs mount

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.0"
-PKG_REV="8"
+PKG_REV="9"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/debug/wireless_tools/build

@@ -28,4 +28,4 @@
 cd $PKG_BUILD
 
 make PREFIX=/usr CC="$CC" AR="$AR" \
-     CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS"
+     CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall

packages/debug/wireless_tools/install

@@ -23,13 +23,8 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/bin/
-  cp $PKG_BUILD/iwconfig $INSTALL/usr/bin/
+  cp $PKG_BUILD/iwmulticall $INSTALL/usr/bin/iwconfig
-  cp $PKG_BUILD/iwgetid $INSTALL/usr/bin/
+  ln -sf iwconfig $INSTALL/usr/bin/iwgetid
-  cp $PKG_BUILD/iwevent $INSTALL/usr/bin/
+  ln -sf iwconfig $INSTALL/usr/bin/iwlist
-  cp $PKG_BUILD/iwlist $INSTALL/usr/bin/
+  ln -sf iwconfig $INSTALL/usr/bin/iwspy
-  cp $PKG_BUILD/iwspy $INSTALL/usr/bin/
+  ln -sf iwconfig $INSTALL/usr/bin/iwpriv
-  cp $PKG_BUILD/iwpriv $INSTALL/usr/bin/
-  cp $PKG_BUILD/ifrename $INSTALL/usr/bin/
-
-mkdir -p $INSTALL/usr/lib/
-  cp $PKG_BUILD/libiw.so.29 $INSTALL/usr/lib/

packages/devel/libevent/install

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libevent*.so* $INSTALL/usr/lib
-

packages/devel/yajl/build

@@ -32,3 +32,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
 make
 
 $MAKEINSTALL
+mv $SYSROOT_PREFIX/usr/lib/libyajl_s.a $SYSROOT_PREFIX/usr/lib/libyajl.a
+rm $SYSROOT_PREFIX/usr/lib/libyajl.so*

packages/devel/yajl/install

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/build/yajl-*/lib/libyajl.so* $INSTALL/usr/lib
-

packages/network/bluez/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.3"
+PKG_VERSION="5.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/procps-ng/install

@@ -23,7 +23,7 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib/
-  cp $PKG_BUILD/proc/.libs/libprocps.so* $INSTALL/usr/lib/
+  cp -P $PKG_BUILD/proc/.libs/libprocps.so* $INSTALL/usr/lib/
 
 mkdir -p $INSTALL/usr/bin/
   cp $PKG_BUILD/.libs/free $INSTALL/usr/bin/