From 42c68aabc3c09917195ad29d2d238559c7bc0ba1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 20:59:36 +0300 Subject: [PATCH 1/6] tcpdump: do not use ssl --- packages/addons/networking/analyzer/tcpdump/build | 2 +- packages/addons/networking/analyzer/tcpdump/changelog.txt | 3 +++ packages/addons/networking/analyzer/tcpdump/meta | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/addons/networking/analyzer/tcpdump/build b/packages/addons/networking/analyzer/tcpdump/build index a8edb99b52..83ac32aff1 100755 --- a/packages/addons/networking/analyzer/tcpdump/build +++ b/packages/addons/networking/analyzer/tcpdump/build @@ -32,7 +32,7 @@ sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --with-pcap=linux \ - --with-crypto=yes \ + --with-crypto=no \ --disable-ipv6 diff --git a/packages/addons/networking/analyzer/tcpdump/changelog.txt b/packages/addons/networking/analyzer/tcpdump/changelog.txt index 14d8489007..cf1dcf369f 100644 --- a/packages/addons/networking/analyzer/tcpdump/changelog.txt +++ b/packages/addons/networking/analyzer/tcpdump/changelog.txt @@ -1,2 +1,5 @@ +2.1.2 +- rebuild + 2.1.1 - initial addon based on tcpdump-4.1.1 diff --git a/packages/addons/networking/analyzer/tcpdump/meta b/packages/addons/networking/analyzer/tcpdump/meta index a23bb7a3ea..11435fbe54 100644 --- a/packages/addons/networking/analyzer/tcpdump/meta +++ b/packages/addons/networking/analyzer/tcpdump/meta @@ -2,9 +2,9 @@ PKG_NAME="tcpdump" PKG_VERSION="4.1.1" PKG_SITE="http://www.tcpdump.org/" PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz" -PKG_REV=1 +PKG_REV=2 PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libpcap openssl" +PKG_BUILD_DEPENDS="toolchain libpcap" PKG_PRIORITY=optional PKG_SECTION="network/analyzer" PKG_SHORTDESC="powerful tool for network monitoring and data acquisition" From 0a15440b3975dbbbd043ba29c98d2dc4ade8c3f9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 21:00:56 +0300 Subject: [PATCH 2/6] boblightd: bump version --- packages/addons/service/multimedia/boblightd/changelog.txt | 3 +++ packages/addons/service/multimedia/boblightd/meta | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt index 0d18ed8792..b289f9379a 100644 --- a/packages/addons/service/multimedia/boblightd/changelog.txt +++ b/packages/addons/service/multimedia/boblightd/changelog.txt @@ -1,3 +1,6 @@ +2.1.2 +- rebuild + 2.1.1 - update to addon version 2.1 diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index 544d55d9e7..760b8966a0 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -20,7 +20,7 @@ PKG_NAME="boblightd" PKG_VERSION="2.0.5" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" From 8c27f02b1e2618ab6b4d900bc094007a347f70cc Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 21:03:45 +0300 Subject: [PATCH 3/6] xbmc: build depends on xf86-video-fglrx for XVBA builds --- packages/mediacenter/xbmc-pvr/meta | 4 ++++ packages/mediacenter/xbmc/meta | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 07936ac985..a4e4c30796 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -136,6 +136,10 @@ if [ "$CRYSTALHD" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS crystalhd" fi +if [ "$XVBA" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS xf86-video-fglrx" +fi + # some python stuff needed for various addons PKG_DEPENDS="$PKG_DEPENDS Imaging" PKG_DEPENDS="$PKG_DEPENDS simplejson" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 4137bacf8b..321ef59235 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -136,6 +136,10 @@ if [ "$CRYSTALHD" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS crystalhd" fi +if [ "$XVBA" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS xf86-video-fglrx" +fi + # some python stuff needed for various addons PKG_DEPENDS="$PKG_DEPENDS Imaging" PKG_DEPENDS="$PKG_DEPENDS simplejson" From 35bc77d3fb07dffe175fba17fe5b13a03a30bf97 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 21:04:49 +0300 Subject: [PATCH 4/6] xf86-video-fglrx: add 'linux' to build depdnds --- packages/x11/driver/xf86-video-fglrx/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index 671a8d87a3..b0d0a6f514 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -26,7 +26,7 @@ PKG_LICENSE="nonfree" PKG_SITE="http://www.ati.com/" PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" PKG_DEPENDS="linux libX11 libXinerama libXcomposite" -PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite" +PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-fglrx: ATI binary Xorg driver" From 0fb99ade66e563a7c8af8276517ea3c94efea595 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 21:06:37 +0300 Subject: [PATCH 5/6] vdr-addon: bump version --- packages/addons/service/multimedia/vdr-addon/changelog.txt | 4 ++++ packages/addons/service/multimedia/vdr-addon/meta | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 8bd9b85680..958aed1f48 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,7 @@ +2.1.5 +- fixed rotorng +- added wirbelscancontrol plugin + 2.1.4 - added live plugin - added rotorng plugin diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 5563ed6b76..1356aea2d9 100755 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="2.1" -PKG_REV="4" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" From db0b513d22f5aed8f73a630d1b02aeba6ae0574e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 May 2012 21:07:23 +0300 Subject: [PATCH 6/6] xbmc & xbmc-pvr: add -wiimote.patch - this fixes xbmc-wiimote build error --- .../patches/xbmc-pvr-11.0.1-990-wiimote.patch | 13 +++++++++++++ .../xbmc/patches/xbmc-11.0.1-990-wiimote.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-990-wiimote.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.1-990-wiimote.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-990-wiimote.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-990-wiimote.patch new file mode 100644 index 0000000000..05379ebdf6 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-990-wiimote.patch @@ -0,0 +1,13 @@ +diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h +index dbdbb94..6f68715 100644 +--- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h ++++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h +@@ -27,7 +27,7 @@ + #include "../../lib/c++/xbmcclient.h" + #endif + //#ifndef WIN32 +-// #include ++ #include + //#endif + #include "wiiuse.h" + //#define ICON_PATH "../../" diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-990-wiimote.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-990-wiimote.patch new file mode 100644 index 0000000000..05379ebdf6 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-990-wiimote.patch @@ -0,0 +1,13 @@ +diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h +index dbdbb94..6f68715 100644 +--- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h ++++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h +@@ -27,7 +27,7 @@ + #include "../../lib/c++/xbmcclient.h" + #endif + //#ifndef WIN32 +-// #include ++ #include + //#endif + #include "wiiuse.h" + //#define ICON_PATH "../../"