Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.0-rc4"
+PKG_VERSION="3.0-rc5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/linux-3.0-rc4-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch

@@ -1,11 +0,0 @@
-diff -Naur linux-2.6.39-rc6/drivers/ata/libata-core.c linux-2.6.39-rc6.patch/drivers/ata/libata-core.c
---- linux-2.6.39-rc6/drivers/ata/libata-core.c	2011-05-04 04:59:13.000000000 +0200
-+++ linux-2.6.39-rc6.patch/drivers/ata/libata-core.c	2011-05-04 19:59:38.952317088 +0200
-@@ -4139,6 +4139,7 @@
- 	 */
- 	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },
- 	{ "PIONEER DVD-RW  DVR-212D",	"1.28", ATA_HORKAGE_NOSETXFER },
-+	{ "PIONEER DVD-RW  DVR-216D",	"1.07",	ATA_HORKAGE_NOSETXFER },
- 	{ "PIONEER DVD-RW  DVR-216D",	"1.08", ATA_HORKAGE_NOSETXFER },
- 
- 	/* End Marker */

packages/multimedia/rtmpdump/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="rtmpdump"
-PKG_VERSION="2.3"
+PKG_VERSION="6155179"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://rtmpdump.mplayerhq.hu/"
-PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
+#PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib openssl"
 PKG_BUILD_DEPENDS="toolchain zlib openssl"
 PKG_PRIORITY="optional"

packages/network/connman/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0.75"
+PKG_VERSION="0.74"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

tools/mkpkg/mkpkg_rtmpdump

@@ -0,0 +1,43 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d rtmpdump.git ]; then
+    git clone git://git.ffmpeg.org/rtmpdump rtmpdump.git
+  fi
+
+  cd rtmpdump.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf rtmpdump-$GIT_REV
+  cp -R rtmpdump.git rtmpdump-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf rtmpdump-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf rtmpdump-$GIT_REV.tar.xz rtmpdump-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf rtmpdump-$GIT_REV