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

This commit is contained in:
Stephan Raue 2012-07-17 12:40:25 +02:00
commit 8aded580f6
11 changed files with 129 additions and 34 deletions

View File

@ -27,7 +27,7 @@ PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
PKG_URL="http://www.makemkv.com/download/${PKG_NAME}-oss-${PKG_VERSION}.tar.gz"
PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz"
PKG_DEPENDS="openssl"
PKG_BUILD_DEPENDS="toolchain openssl"
PKG_BUILD_DEPENDS="toolchain openssl expat"
PKG_PRIORITY="optional"
PKG_SECTION="lib/multimedia"
PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."

View File

@ -1,3 +1,6 @@
2.1.6
- update to oscam-7168
2.1.5
- update to oscam-7038
- start userspace DVB drivers before oscam

View File

@ -20,8 +20,8 @@
################################################################################
PKG_NAME="oscam"
PKG_VERSION="7038"
PKG_REV="5"
PKG_VERSION="7168"
PKG_REV="6"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"

View File

@ -27,17 +27,17 @@
<setting label="2130" type="lsep"/>
<setting type="sep" />
<setting id="NET_IPADDRESS" type="ipaddress" label="2131" default=""/>
<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24"/>
<setting id="NET_GATEWAY" type="ipaddress" label="2133" default=""/>
<setting id="NET_DNS1" type="ipaddress" label="2134" default=""/>
<setting id="NET_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
<setting id="NET_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
<setting label="2150" type="lsep"/>
<setting type="sep" />
<setting id="NET_SSID" type="text" label="2151" default=""/>
<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" visible="!eq(-1,)"/>
<setting id="NET_GATEWAY" type="ipaddress" label="2133" default="" visible="!eq(-2,)"/>
<setting id="NET_DNS1" type="ipaddress" label="2134" default="" visible="!eq(-3,)"/>
<setting id="NET_DNS2" type="ipaddress" label="2135" default="" visible="!eq(-1,)"/>
<setting id="NET_DNS3" type="ipaddress" label="2136" default="" visible="!eq(-1,)"/>
<setting label="2150" type="lsep" visible="eq(-10,1)"/>
<setting type="sep" visible="eq(-11,1)"/>
<setting id="NET_SSID" type="text" label="2151" default="" visible="eq(-12,1)"/>
<!-- <setting id="NET_HIDDEN" type="bool" label="2152" default="false" /> -->
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" visible="!eq(-1,) + eq(-13,1)"/>
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" visible="!eq(-1,0) + !eq(-2,) + eq(-14,1)"/>
</category>
<!-- Network 2 -->
@ -45,21 +45,21 @@
<setting label="2120" type="lsep"/>
<setting type="sep" />
<setting id="NET2_NETWORK" type="labelenum" label="2121" values="NONE|LAN|WLAN" sort="yes" default="NONE" />
<setting id="NET2_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth1" enable="!eq(-1,1)"/>
<setting label="2130" type="lsep"/>
<setting type="sep" />
<setting id="NET2_IPADDRESS" type="ipaddress" label="2131" default="" enable="!eq(-4,1)"/>
<setting id="NET2_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" enable="!eq(-5,1)"/>
<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default="" enable="!eq(-6,1)"/>
<setting id="NET2_DNS1" type="ipaddress" label="2134" default="" enable="!eq(-7,1)"/>
<setting id="NET2_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
<setting id="NET2_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
<setting label="2150" type="lsep"/>
<setting type="sep" />
<setting id="NET2_SSID" type="text" label="2151" default="" enable="!eq(-12,1)"/>
<setting id="NET2_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth1" visible="!eq(-1,1)"/>
<setting label="2130" type="lsep" visible="!eq(-2,1)"/>
<setting type="sep" visible="!eq(-3,1)"/>
<setting id="NET2_IPADDRESS" type="ipaddress" label="2131" default="" visible="!eq(-4,1)"/>
<setting id="NET2_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24" visible="!eq(-1,)"/>
<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default="" visible="!eq(-2,)"/>
<setting id="NET2_DNS1" type="ipaddress" label="2134" default="" visible="!eq(-3,)"/>
<setting id="NET2_DNS2" type="ipaddress" label="2135" default="" visible="!eq(-1,)"/>
<setting id="NET2_DNS3" type="ipaddress" label="2136" default="" visible="!eq(-1,)"/>
<setting label="2150" type="lsep" visible="eq(-10,2)"/>
<setting type="sep" visible="eq(-11,2)"/>
<setting id="NET2_SSID" type="text" label="2151" default="" visible="eq(-12,2)"/>
<!-- <setting id="NET2_HIDDEN" type="bool" label="2152" default="false" /> -->
<setting id="NET2_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
<setting id="NET2_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" visible="!eq(-1,) + eq(-13,2)"/>
<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default="" visible="!eq(-1,0) + !eq(-2,) + eq(-14,2)"/>
</category>
<!-- SAMBA -->
@ -67,8 +67,8 @@
<setting label="5010" type="lsep"/>
<setting type="sep" />
<setting id="SAMBA_START" type="bool" label="5011" default="true" />
<setting id="SAMBA_SECURITY" type="bool" label="5012" default="false" enable="eq(-1,true)"/>
<setting id="SAMBA_USERNAME" type="text" label="5013" default="openelec" enable="eq(-1,true) + eq(-2,true)"/>
<setting id="SAMBA_PASSWORD" type="text" option="hidden" label="5014" default="openelec" enable="eq(-2,true)+ eq(-3,true)"/>
<setting id="SAMBA_SECURITY" type="bool" label="5012" default="false" visible="eq(-1,true)"/>
<setting id="SAMBA_USERNAME" type="text" label="5013" default="openelec" visible="eq(-1,true) + eq(-2,true)"/>
<setting id="SAMBA_PASSWORD" type="text" option="hidden" label="5014" default="openelec" visible="eq(-2,true)+ eq(-3,true)"/>
</category>
</settings>

View File

@ -0,0 +1,23 @@
diff --git a/Makefile.include.in b/Makefile.include.in
index b70245d..0537b86 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -1,4 +1,4 @@
-AR=ar
+AR=@AR@
ARFLAGS=crus
RM=rm -rf
SHELL=@SHELL@
diff --git a/configure.in b/configure.in
index 7348529..baea8e0 100755
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME],
AC_MSG_CHECKING([for lib$2 soname])
$1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
+ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
fi
else
AC_MSG_CHECKING([for lib$2 dylib])

View File

@ -0,0 +1,23 @@
diff --git a/Makefile.include.in b/Makefile.include.in
index b70245d..0537b86 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -1,4 +1,4 @@
-AR=ar
+AR=@AR@
ARFLAGS=crus
RM=rm -rf
SHELL=@SHELL@
diff --git a/configure.in b/configure.in
index 7348529..baea8e0 100755
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME],
AC_MSG_CHECKING([for lib$2 soname])
$1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
+ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
fi
else
AC_MSG_CHECKING([for lib$2 dylib])

View File

@ -0,0 +1,23 @@
diff --git a/Makefile.include.in b/Makefile.include.in
index b70245d..0537b86 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -1,4 +1,4 @@
-AR=ar
+AR=@AR@
ARFLAGS=crus
RM=rm -rf
SHELL=@SHELL@
diff --git a/configure.in b/configure.in
index 7348529..baea8e0 100755
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME],
AC_MSG_CHECKING([for lib$2 soname])
$1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
+ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
fi
else
AC_MSG_CHECKING([for lib$2 dylib])

View File

@ -0,0 +1,23 @@
diff --git a/Makefile.include.in b/Makefile.include.in
index b70245d..0537b86 100644
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -1,4 +1,4 @@
-AR=ar
+AR=@AR@
ARFLAGS=crus
RM=rm -rf
SHELL=@SHELL@
diff --git a/configure.in b/configure.in
index 7348529..baea8e0 100755
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME],
AC_MSG_CHECKING([for lib$2 soname])
$1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
+ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
fi
else
AC_MSG_CHECKING([for lib$2 dylib])

View File

@ -96,7 +96,7 @@ fi
fi
# IP settings
if [ -z "$NET_IPADDRESS" ]; then
if [ -z "$NET_IPADDRESS" -o "$NET_IPADDRESS" = "0.0.0.0" ]; then
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
else
echo "IPv4.method=manual" >> $CONNMAN_PROFILE
@ -157,7 +157,7 @@ fi
fi
# IP settings
if [ -z "$NET2_IPADDRESS" ]; then
if [ -z "$NET2_IPADDRESS" -o "$NET2_IPADDRESS" = "0.0.0.0" ]; then
echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
else
echo "IPv4.method=manual" >> $CONNMAN_PROFILE

View File

@ -24,7 +24,7 @@ PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"
PKG_SITE="http://www.virtualbox.org"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${ARCH}.tar.bz2"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${TARGET_ARCH}.tar.bz2"
PKG_DEPENDS="libXcomposite libXdamage libXfixes libXext libX11 libxcb libXau"
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -24,4 +24,4 @@
mkdir $BUILD/$PKG_NAME-$PKG_VERSION
tar jxpf $SOURCES/$1/$PKG_NAME-$PKG_VERSION-$ARCH.tar.bz2 -C $BUILD/$PKG_NAME-$PKG_VERSION
tar jxpf $SOURCES/$1/$PKG_NAME-$PKG_VERSION-$TARGET_ARCH.tar.bz2 -C $BUILD/$PKG_NAME-$PKG_VERSION