mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
4
packages/3rdparty/download/CouchPotato/meta
vendored
4
packages/3rdparty/download/CouchPotato/meta
vendored
@@ -20,12 +20,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="CouchPotato"
|
||||
PKG_VERSION="2504efc"
|
||||
PKG_VERSION="6cd66ae"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://github.com/RuudBurger/CouchPotato"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="Python SABnzbd"
|
||||
PKG_BUILD_DEPENDS="toolchain Python"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
2
packages/3rdparty/download/SABnzbd/meta
vendored
2
packages/3rdparty/download/SABnzbd/meta
vendored
@@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SABnzbd"
|
||||
PKG_VERSION="0.6.4"
|
||||
PKG_VERSION="0.6.7"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
4
packages/3rdparty/download/SickBeard/meta
vendored
4
packages/3rdparty/download/SickBeard/meta
vendored
@@ -20,12 +20,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SickBeard"
|
||||
PKG_VERSION="cb76543"
|
||||
PKG_VERSION="e0e8f0e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://github.com/midgetspy/Sick-Beard"
|
||||
PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS="Python SABnzbd Cheetah"
|
||||
PKG_BUILD_DEPENDS="toolchain Python Cheetah"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
0.99.2
|
||||
- update to SABnzbd-0.6.7
|
||||
- update to SickBeard-e0e8f0e
|
||||
- update to CouchPotato-6cd66ae
|
||||
|
||||
0.99.1
|
||||
- initial version SABnzbd-Suite
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
PKG_NAME="SABnzbd-Suite"
|
||||
PKG_VERSION="0.99"
|
||||
PKG_REV="1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
|
||||
@@ -29,3 +29,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
|
||||
cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
|
||||
find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
|
||||
rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
cp $BUILD/libevent-[0-9]*/.libs/libevent*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
0.99.8
|
||||
- update to transmission-2.33
|
||||
- add libevent to addon
|
||||
|
||||
0.99.7
|
||||
- change icon
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="transmission"
|
||||
PKG_VERSION="2.31"
|
||||
PKG_REV="7"
|
||||
PKG_VERSION="2.33"
|
||||
PKG_REV="8"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.transmissionbt.com/"
|
||||
|
||||
@@ -24,6 +24,7 @@ ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
|
||||
LOG_FILE="$ADDON_HOME/service.log"
|
||||
|
||||
|
||||
export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
|
||||
|
||||
mkdir -p $ADDON_HOME
|
||||
@@ -63,5 +64,7 @@ else
|
||||
fi
|
||||
|
||||
if [ ! $(pidof transmission-daemon) ];then
|
||||
transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
|
||||
chmod +x $ADDON_DIR/lib/*
|
||||
|
||||
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
|
||||
fi
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
0.99.6
|
||||
- update to hts-tvheadend-9d775da
|
||||
|
||||
0.99.5
|
||||
- update to hts-tvheadend-ca68ed4
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="hts-tvheadend"
|
||||
PKG_VERSION="ca68ed4"
|
||||
PKG_REV="5"
|
||||
PKG_VERSION="9d775da"
|
||||
PKG_REV="6"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
|
||||
# PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS="libiconv avahi openssl"
|
||||
PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libogg"
|
||||
PKG_VERSION="1.2.2"
|
||||
PKG_VERSION="1.3.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="file"
|
||||
PKG_VERSION="5.07"
|
||||
PKG_VERSION="5.08"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 19f5096d0b4c1a49af6cc4e0d086d6128c493bd8 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Wed, 18 May 2011 18:11:23 +0000
|
||||
Subject: [PATCH] Fixed 0 file problem.
|
||||
|
||||
---
|
||||
magic/Magdir/msdos | 11 ++++++-----
|
||||
1 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
|
||||
index 731d50b..f8852cb 100644
|
||||
--- a/magic/Magdir/msdos
|
||||
+++ b/magic/Magdir/msdos
|
||||
@@ -389,10 +389,11 @@
|
||||
>>4 uleshort&0x4842 >0 \bsupport
|
||||
>0 ubyte x \b)
|
||||
# DOS driver cmd640x.sys has 0x12 instead of 0xffffffff for pointer field to next device header
|
||||
-0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable (
|
||||
->4 uleshort&0x8000 0x8000 \bcharacter device driver
|
||||
->>10 string x %-.8s
|
||||
->4 uleshort&0x4000 0x4000 \b,control strings-support)
|
||||
+# Too weak, matches files that only contain 0's
|
||||
+#0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable (
|
||||
+#>4 uleshort&0x8000 0x8000 \bcharacter device driver
|
||||
+#>>10 string x %-.8s
|
||||
+#>4 uleshort&0x4000 0x4000 \b,control strings-support)
|
||||
|
||||
# test too generic ?
|
||||
0 byte 0x8c DOS executable (COM)
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
|
||||
index c40e1b5..d252ced 100644
|
||||
--- a/magic/Magdir/rpm
|
||||
+++ b/magic/Magdir/rpm
|
||||
@@ -21,12 +21,29 @@
|
||||
>>>8 beshort 8 RS6000
|
||||
>>>8 beshort 9 IA64
|
||||
>>>8 beshort 10 Sparc64
|
||||
+>>>8 beshort 11 MIPSel
|
||||
+>>>8 beshort 12 ARM
|
||||
+>>>8 beshort 13 MiNT
|
||||
+>>>8 beshort 14 S/390
|
||||
+>>>8 beshort 15 S/390x
|
||||
+>>>8 beshort 16 PowerPC64
|
||||
+>>>8 beshort 17 SuperH
|
||||
+>>>8 beshort 18 Xtensa
|
||||
|
||||
#delta RPM Daniel Novotny (dnovotny@redhat.com)
|
||||
0 string drpm Delta RPM
|
||||
!:mime application/x-rpm
|
||||
>12 string x %s
|
||||
-
|
||||
+>>>8 beshort 1 i386/x86_64
|
||||
+>>>8 beshort 2 Alpha/Sparc64
|
||||
+>>>8 beshort 3 Sparc
|
||||
+>>>8 beshort 4 MIPS
|
||||
+>>>8 beshort 5 PowerPC
|
||||
+>>>8 beshort 6 68000
|
||||
+>>>8 beshort 7 SGI
|
||||
+>>>8 beshort 8 RS6000
|
||||
+>>>8 beshort 9 IA64
|
||||
+>>>8 beshort 10 Sparc64
|
||||
>>>8 beshort 11 MIPSel
|
||||
>>>8 beshort 12 ARM
|
||||
>>>8 beshort 13 MiNT
|
||||
@@ -42,3 +59,21 @@
|
||||
0 string drpm Delta RPM
|
||||
!:mime application/x-rpm
|
||||
>12 string x %s
|
||||
+>>>8 beshort 1 i386/x86_64
|
||||
+>>>8 beshort 2 Alpha/Sparc64
|
||||
+>>>8 beshort 3 Sparc
|
||||
+>>>8 beshort 4 MIPS
|
||||
+>>>8 beshort 5 PowerPC
|
||||
+>>>8 beshort 6 68000
|
||||
+>>>8 beshort 7 SGI
|
||||
+>>>8 beshort 8 RS6000
|
||||
+>>>8 beshort 9 IA64
|
||||
+>>>8 beshort 10 Sparc64
|
||||
+>>>8 beshort 11 MIPSel
|
||||
+>>>8 beshort 12 ARM
|
||||
+>>>8 beshort 13 MiNT
|
||||
+>>>8 beshort 14 S/390
|
||||
+>>>8 beshort 15 S/390x
|
||||
+>>>8 beshort 16 PowerPC64
|
||||
+>>>8 beshort 17 SuperH
|
||||
+>>>8 beshort 18 Xtensa
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/magic/Magdir/archive b/magic/Magdir/archive
|
||||
index c998e5b..4da532a 100644
|
||||
--- a/magic/Magdir/archive
|
||||
+++ b/magic/Magdir/archive
|
||||
@@ -688,6 +688,7 @@
|
||||
>>4 byte 0x0b \b, at least v1.1 to extract
|
||||
>>0x161 string WINZIP \b, WinZIP self-extracting
|
||||
>>4 byte 0x14 \b, at least v2.0 to extract
|
||||
+>>4 byte 0x2d Zip64, at least v3.0 to extract
|
||||
|
||||
# Zoo archiver
|
||||
20 lelong 0xfdc4a7dc Zoo archive data
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user