From 553a58047987c4a56a0598d9078751f1ee22ed1f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 1 Feb 2014 14:14:29 +0200 Subject: [PATCH 01/12] xbmc-addon-xvdr: update to xbmc-addon-xvdr-df75826 --- packages/mediacenter/xbmc-addon-xvdr/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-addon-xvdr/package.mk b/packages/mediacenter/xbmc-addon-xvdr/package.mk index 0bf7e867e2..59c2f8d9d9 100644 --- a/packages/mediacenter/xbmc-addon-xvdr/package.mk +++ b/packages/mediacenter/xbmc-addon-xvdr/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-addon-xvdr" -PKG_VERSION="f267086" +PKG_VERSION="df75826" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 5b26bc1a39aab5ad129bd352fe45f5599924a90c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 1 Feb 2014 14:14:44 +0200 Subject: [PATCH 02/12] xbmc: update to xbmc-13.alpha-a4342cf --- packages/mediacenter/xbmc-theme-Confluence/package.mk | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index 70d77b8f6e..38d792dc33 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-536cf62" +PKG_VERSION="13.alpha-a4342cf" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 1694a5ca46..db6879766b 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-536cf62" +PKG_VERSION="13.alpha-a4342cf" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d91f81234b734c89f03ef3d59dde178d126d3b0a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 1 Feb 2014 19:06:52 +0200 Subject: [PATCH 03/12] xf86-video-intel: update to xf86-video-intel-2.99.908 --- packages/x11/driver/xf86-video-intel/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 58323458d2..50619ce93e 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.99.907" +PKG_VERSION="2.99.908" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From faa821730fab81a5981898305659de1f3bbb544e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 00:12:39 +0200 Subject: [PATCH 04/12] remove package: xbmc-addon-lcd --- .../mediacenter/xbmc-addon-lcd/package.mk | 43 ------------- .../xbmc-addon-lcd-6b08848-be_silent.patch | 61 ------------------- tools/mkpkg/mkpkg_xbmc-addon-lcd | 43 ------------- 3 files changed, 147 deletions(-) delete mode 100644 packages/mediacenter/xbmc-addon-lcd/package.mk delete mode 100644 packages/mediacenter/xbmc-addon-lcd/patches/xbmc-addon-lcd-6b08848-be_silent.patch delete mode 100755 tools/mkpkg/mkpkg_xbmc-addon-lcd diff --git a/packages/mediacenter/xbmc-addon-lcd/package.mk b/packages/mediacenter/xbmc-addon-lcd/package.mk deleted file mode 100644 index bc194a8216..0000000000 --- a/packages/mediacenter/xbmc-addon-lcd/package.mk +++ /dev/null @@ -1,43 +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 . -################################################################################ - -PKG_NAME="xbmc-addon-lcd" -PKG_VERSION="6b08848" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/Memphiz/script.xbmc.lcd" -PKG_SITE="https://github.com/herrnst/script.xbmc.lcd" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="mediacenter" -PKG_SHORTDESC="LCD addon for XBMC" -PKG_LONGDESC="This addon allows XBM to connect to LCDproc." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -make_target() { - : # nothing todo -} - -makeinstall_target() { - mkdir -p $INSTALL/usr/share/xbmc/addons - cp -PRf script.xbmc.lcd $INSTALL/usr/share/xbmc/addons -} diff --git a/packages/mediacenter/xbmc-addon-lcd/patches/xbmc-addon-lcd-6b08848-be_silent.patch b/packages/mediacenter/xbmc-addon-lcd/patches/xbmc-addon-lcd-6b08848-be_silent.patch deleted file mode 100644 index f54ceaf554..0000000000 --- a/packages/mediacenter/xbmc-addon-lcd/patches/xbmc-addon-lcd-6b08848-be_silent.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 70ba5ad47b5bb49216c30d5321948d33dd7a3cfe Mon Sep 17 00:00:00 2001 -From: Daniel Scheller -Date: Wed, 14 Nov 2012 23:23:26 +0100 -Subject: [PATCH] testing: disable all connection notifications - ---- - script.xbmc.lcd/lcdmain.py | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/script.xbmc.lcd/lcdmain.py b/script.xbmc.lcd/lcdmain.py -index 585f87d..15a7e3f 100644 ---- a/script.xbmc.lcd/lcdmain.py -+++ b/script.xbmc.lcd/lcdmain.py -@@ -125,26 +125,26 @@ def handleConnectLCD(): - - ret = g_lcdproc.Initialize() - -- if not ret: -- count = 10 -- if not g_failedConnectionNotified: -- g_failedConnectionNotified = True -- g_initialConnectAttempt = False -- text = __settings__.getLocalizedString(500) -- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -- while (not xbmc.abortRequested) and (count > 0): -- time.sleep(1) -- count -= 1 -- ret = False -- else: -- text = __settings__.getLocalizedString(501) -- if not g_failedConnectionNotified and not g_initialConnectAttempt: -- xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -- g_failedConnectionNotified = True -- break -+ #if not ret: -+ # count = 10 -+ # if not g_failedConnectionNotified: -+ # g_failedConnectionNotified = True -+ # g_initialConnectAttempt = False -+ # text = __settings__.getLocalizedString(500) -+ # xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -+ # while (not xbmc.abortRequested) and (count > 0): -+ # time.sleep(1) -+ # count -= 1 -+ # ret = False -+ #else: -+ # text = __settings__.getLocalizedString(501) -+ # if not g_failedConnectionNotified and not g_initialConnectAttempt: -+ # xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (__scriptname__,text,10,__icon__)) -+ # g_failedConnectionNotified = True -+ # break - - # initial connection attempt done, update flag -- g_initialConnectAttempt = False -+ # g_initialConnectAttempt = False - return ret - - #MAIN - entry point --- -1.7.10 - diff --git a/tools/mkpkg/mkpkg_xbmc-addon-lcd b/tools/mkpkg/mkpkg_xbmc-addon-lcd deleted file mode 100755 index b5deb80e52..0000000000 --- a/tools/mkpkg/mkpkg_xbmc-addon-lcd +++ /dev/null @@ -1,43 +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 -################################################################################ - -echo "getting sources..." - if [ ! -d xbmc-addon-lcd.git ]; then - git clone git://github.com/herrnst/script.xbmc.lcd.git xbmc-addon-lcd.git - fi - - cd xbmc-addon-lcd.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf xbmc-addon-lcd-$GIT_REV - cp -R xbmc-addon-lcd.git xbmc-addon-lcd-$GIT_REV - -echo "cleaning sources..." - rm -rf xbmc-addon-lcd-$GIT_REV/.git - -echo "packing sources..." - tar cvJf xbmc-addon-lcd-$GIT_REV.tar.xz xbmc-addon-lcd-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf xbmc-addon-lcd-$GIT_REV From 441ab8f54ff70939bc2afd6bf3abe6cc1b3fba3e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 00:14:09 +0200 Subject: [PATCH 05/12] xf86-video-intel: update to xf86-video-intel-2.99.909 --- packages/x11/driver/xf86-video-intel/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 50619ce93e..d7a1d7d339 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.99.908" +PKG_VERSION="2.99.909" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 8f1f380709af9992e6999c1656a1d7fc3a9ab4ea Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 00:14:10 +0200 Subject: [PATCH 06/12] vdr-iptv: update to vdr-iptv-2.0.2 --- packages/3rdparty/multimedia/vdr-iptv/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-iptv/package.mk b/packages/3rdparty/multimedia/vdr-iptv/package.mk index 355609bb5c..8e5b6f2db4 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/package.mk +++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="vdr-iptv" -PKG_VERSION="2.0.1" +PKG_VERSION="2.0.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 7fc6fe017e6354d3e47ee9b242a92e9de3f257fc Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:25:05 +0200 Subject: [PATCH 07/12] remove package: libXft --- packages/x11/lib/libXft/package.mk | 33 ------------------------------ 1 file changed, 33 deletions(-) delete mode 100644 packages/x11/lib/libXft/package.mk diff --git a/packages/x11/lib/libXft/package.mk b/packages/x11/lib/libXft/package.mk deleted file mode 100644 index f992e5027e..0000000000 --- a/packages/x11/lib/libXft/package.mk +++ /dev/null @@ -1,33 +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 . -################################################################################ - -PKG_NAME="libXft" -PKG_VERSION="2.3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros xproto libXrender fontconfig freetype" -PKG_PRIORITY="optional" -PKG_SECTION="x11/lib" -PKG_SHORTDESC="libxft: X FreeType library" -PKG_LONGDESC="X FreeType library" - -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" From dc83bdcc843b09fed165e05dafca43f3c9bd3986 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:25:51 +0200 Subject: [PATCH 08/12] libXfont: build as static library --- packages/x11/lib/libXfont/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/lib/libXfont/package.mk b/packages/x11/lib/libXfont/package.mk index c276bf9e6f..073665e2df 100644 --- a/packages/x11/lib/libXfont/package.mk +++ b/packages/x11/lib/libXfont/package.mk @@ -32,7 +32,8 @@ PKG_LONGDESC="X font Library" PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="--disable-ipv6 \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ + --disable-ipv6 \ --enable-freetype \ --enable-builtins \ --disable-pcfformat \ From b36205046cc5dbf73c06984dd6df98ec39ba0b45 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:26:05 +0200 Subject: [PATCH 09/12] libXtst: build as static library --- packages/x11/lib/libXtst/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXtst/package.mk b/packages/x11/lib/libXtst/package.mk index bc544d6823..597beec6a5 100644 --- a/packages/x11/lib/libXtst/package.mk +++ b/packages/x11/lib/libXtst/package.mk @@ -32,4 +32,4 @@ PKG_LONGDESC="The Xtst Library" PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="--with-gnu-ld --without-xmlto" +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-gnu-ld --without-xmlto" From 31da59071d8904f124f9081b08a0c2258a18ac1c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:39:01 +0200 Subject: [PATCH 10/12] xf86-video-nvidia: dont depend on libXinerama --- packages/x11/driver/xf86-video-nvidia/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 8983d3ce9d..62bea8cb84 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" [ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" [ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" -PKG_DEPENDS_TARGET="toolchain util-macros linux libXinerama xorg-server" +PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" From 03feaba2e9bc8ca6ecfccff27dc867acd227b51a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:39:08 +0200 Subject: [PATCH 11/12] xf86-video-nvidia-legacy: dont depend on libXinerama --- packages/x11/driver/xf86-video-nvidia-legacy/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index ded0b0aa52..4475b069ec 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" [ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run" [ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" -PKG_DEPENDS_TARGET="toolchain util-macros libXinerama linux xorg-server" +PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" From f0fa9727718f1b8ce6d5202b53289b0a70218e09 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 2 Feb 2014 01:39:39 +0200 Subject: [PATCH 12/12] libXinerama: build as static library --- packages/x11/lib/libXinerama/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXinerama/package.mk b/packages/x11/lib/libXinerama/package.mk index 5e86f5f98b..0eecea64f0 100644 --- a/packages/x11/lib/libXinerama/package.mk +++ b/packages/x11/lib/libXinerama/package.mk @@ -32,4 +32,4 @@ PKG_LONGDESC="libXinerama is the Xinerama library." PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull" +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"