summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2012-11-19 18:28:01 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2012-11-19 18:28:17 -0700
commit1ec3f1e9e72d3d276f98907592faed198f223562 (patch)
tree3bc3873d7814dade3dc8a51eb9d93952704d4167
parent81237c287fc4f3137ba4f6791ec56da95d6f32fd (diff)
downloadxbmc-rpm-1ec3f1e9e72d3d276f98907592faed198f223562.tar.gz
xbmc-rpm-1ec3f1e9e72d3d276f98907592faed198f223562.tar.xz
xbmc-rpm-1ec3f1e9e72d3d276f98907592faed198f223562.zip
Add pvr addons
-rw-r--r--.gitignore1
-rw-r--r--xbmc-pvr-addons-generate-tarball-xz.sh36
-rw-r--r--xbmc.spec11
3 files changed, 46 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 96ca3f0..fcc179a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/xbmc-9.11-patched.tar.xz
/xbmc-12.0-Frodo_alpha6-patched.tar.xz
/xbmc-12.0-Frodo_alpha7-patched.tar.xz
+/xbmc-pvr-addons-1e666ced21-patched.tar.xz
diff --git a/xbmc-pvr-addons-generate-tarball-xz.sh b/xbmc-pvr-addons-generate-tarball-xz.sh
new file mode 100644
index 0000000..d422292
--- /dev/null
+++ b/xbmc-pvr-addons-generate-tarball-xz.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+# The xbmc-pvr-addon software does not yet use version numbers, so we'll
+# just use git hashes for identifiers.
+
+GITHASH=1e666ced21
+GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip
+
+# download zipball
+if [[ ! -f xbmc-pvr-addons-$GITHASH.zip ]]; then
+ curl -o xbmc-pvr-addons-$GITHASH.zip -L $GITHUBURL
+fi
+
+# extract zipball
+find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec rm -r '{}' \
+unzip xbmc-pvr-addons-$GITHASH.zip
+
+# Shorten GitHub's auto-generated top-level directory.
+if [[ -d pvr-addons ]]; then
+ rm -r pvr-addons
+fi
+find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec mv '{}' pvr-
+
+pushd pvr-addons
+
+# remove Windows stuff
+rm -r project
+
+popd
+
+# repack
+tar -cJvf xbmc-pvr-addons-$GITHASH-patched.tar.xz pvr-addons
+
+rm -r pvr-addons
diff --git a/xbmc.spec b/xbmc.spec
index 6d27fb9..c931562 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -5,7 +5,7 @@
Name: xbmc
Version: 12.0
-Release: 0.1.%{PRERELEASE}%{?dist}
+Release: 0.2.%{PRERELEASE}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -19,6 +19,10 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
+# xbmc pvr addons are shipped as a separate git repo.
+Source2: xbmc-pvr-addons-1e666ced21-patched.tar.xz
+Source3: xbmc-pvr-addons-generate-tarball-xz.sh
+
# filed ticket, but patch still needs work
# http://trac.xbmc.org/ticket/9658
Patch2: xbmc-12.0-dvdread.patch
@@ -215,7 +219,7 @@ forecast functions, together third-party plugins.
%prep
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -a 2 -n %{name}-%{DIRVERSION}
%patch2 -p0
#patch3 -p0
@@ -321,6 +325,9 @@ fi
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Tue Nov 14 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.2.Frodo_alpha7
+- Add pvr addons
+
* Tue Nov 13 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.1.Frodo_alpha7
- Update to Frodo alpha 7
- Drop bootstrap patch (system libdvdread works properly now)