xbmc-frodo-pvr: merge with package 'xbmc-frodo'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
ldiqual · Sep 4, 2012 · c97e3f3 · c97e3f3
1 parent 5d4b402
commit c97e3f3
Show file tree

Hide file tree

Showing 33 changed files with 7 additions and 980 deletions.
diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta
@@ -19,11 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-if [ "$PVR" = yes ]; then
-  PKG_VERSION="pvr-8f0c91b"
-else
-  PKG_VERSION="58abd46"
-fi
+PKG_VERSION="8f0c91b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/mediacenter/xbmc-frodo/install b/packages/mediacenter/xbmc-frodo/install
@@ -29,9 +29,7 @@ mkdir -p $INSTALL/usr/bin
   cp $PKG_DIR/scripts/gputemp $INSTALL/usr/bin
   cp $PKG_DIR/scripts/wait_on_xbmc_exit $INSTALL/usr/bin
   cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
-  if [ "$PVR" = yes ]; then
-    cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin
-  fi
+  cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib/xbmc
   cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc

diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta
@@ -19,11 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-if [ "$PVR" = yes ]; then
-  PKG_VERSION="pvr-8f0c91b"
-else
-  PKG_VERSION="58abd46"
-fi
+PKG_VERSION="8f0c91b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -46,6 +42,10 @@ PKG_AUTORECONF="no"
   PKG_DEPENDS="$PKG_DEPENDS Imaging"
   PKG_DEPENDS="$PKG_DEPENDS simplejson"
 
+# various PVR clients
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-njoy"
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus"
+
 if [ "$DISPLAYSERVER" = "xorg-server" ]; then
   # for libX11 support
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
@@ -176,8 +176,3 @@ fi
 if [ "$XVBA" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS xf86-video-fglrx"
 fi
-
-if [ "$PVR" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-njoy"
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus"
-fi
diff --git a/...center/xbmc-frodo/patches/xbmc-frodo-58abd46-462-add_remote_irtrans_mediacenter-0.1.patch b/...center/xbmc-frodo/patches/xbmc-frodo-58abd46-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/...-add_support_to_specify_GIT_REV-0.1.patch → ...-add_support_to_specify_GIT_REV-0.1.patch b/...-add_support_to_specify_GIT_REV-0.1.patch → ...-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/...o-58abd46-303-fix_libdvd_xFLAGS-0.1.patch → ...o-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch b/...o-58abd46-303-fix_libdvd_xFLAGS-0.1.patch → ...o-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/...rodo-58abd46-311-fix_rsxs_build-0.1.patch → ...rodo-8f0c91b-311-fix_rsxs_build-0.1.patch b/...rodo-58abd46-311-fix_rsxs_build-0.1.patch → ...rodo-8f0c91b-311-fix_rsxs_build-0.1.patch
diff --git a/...-texturepacker-hostflags-and-rework.patch → ...-texturepacker-hostflags-and-rework.patch b/...-texturepacker-hostflags-and-rework.patch → ...-texturepacker-hostflags-and-rework.patch
diff --git a/...abd46-402-enable_yasm_in_ffmpeg-0.1.patch → ...0c91b-402-enable_yasm_in_ffmpeg-0.1.patch b/...abd46-402-enable_yasm_in_ffmpeg-0.1.patch → ...0c91b-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/...ONOPTIMIZE_with_external_Python-0.1.patch → ...ONOPTIMIZE_with_external_Python-0.1.patch b/...ONOPTIMIZE_with_external_Python-0.1.patch → ...ONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/...-58abd46-452-change_lcd_content-0.1.patch → ...-8f0c91b-452-change_lcd_content-0.1.patch b/...-58abd46-452-change_lcd_content-0.1.patch → ...-8f0c91b-452-change_lcd_content-0.1.patch
diff --git a/...46-453-add_openelec.tv_RSS_news-0.1.patch → ...1b-453-add_openelec.tv_RSS_news-0.1.patch b/...46-453-add_openelec.tv_RSS_news-0.1.patch → ...1b-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/...o-58abd46-454-disable_backslash-0.1.patch → ...o-8f0c91b-454-disable_backslash-0.1.patch b/...o-58abd46-454-disable_backslash-0.1.patch → ...o-8f0c91b-454-disable_backslash-0.1.patch
diff --git a/...8abd46-457-fix_connection_check-0.1.patch → ...f0c91b-457-fix_connection_check-0.1.patch b/...8abd46-457-fix_connection_check-0.1.patch → ...f0c91b-457-fix_connection_check-0.1.patch
diff --git a/...58abd46-463-add_remote_devinput-0.1.patch → ...8f0c91b-463-add_remote_devinput-0.1.patch b/...58abd46-463-add_remote_devinput-0.1.patch → ...8f0c91b-463-add_remote_devinput-0.1.patch
diff --git a/...4-add_eject_keymapping_for_lirc-0.1.patch → ...4-add_eject_keymapping_for_lirc-0.1.patch b/...4-add_eject_keymapping_for_lirc-0.1.patch → ...4-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/...frodo-58abd46-981-toggleButtonState.patch → ...frodo-8f0c91b-981-toggleButtonState.patch b/...frodo-58abd46-981-toggleButtonState.patch → ...frodo-8f0c91b-981-toggleButtonState.patch
diff --git a/...xbmc-frodo-58abd46-999-crosscompile.patch → ...xbmc-frodo-8f0c91b-999-crosscompile.patch b/...xbmc-frodo-58abd46-999-crosscompile.patch → ...xbmc-frodo-8f0c91b-999-crosscompile.patch
diff --git a/...er/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-001-add_support_to_specify_GIT_REV-0.1.patch b/...er/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/...ges/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch b/...ges/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-311-fix_rsxs_build-0.1.patch