From 2964a85265a695f30718ea4739a1f8538480304e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 14 Oct 2013 12:01:56 +0300
Subject: [PATCH] switch to xbmc Gotham

---
 .../multimedia/vdr-plugin-vnsiserver/meta     |  5 +-
 .../3rdparty/multimedia/vdr-plugin-xvdr/meta  |  5 +-
 packages/mediacenter/xbmc-addon-xvdr/meta     |  5 +-
 .../mediacenter/xbmc-pvr-addons/package.mk    |  5 +-
 .../mediacenter/xbmc-theme-Confluence/meta    |  6 +-
 packages/mediacenter/xbmc/package.mk          | 27 +++----
 packages/multimedia/ffmpeg/build              |  7 --
 packages/multimedia/ffmpeg/meta               |  5 +-
 tools/mkpkg/mkpkg_xbmc-addon-xvdr-frodo       | 43 ----------
 tools/mkpkg/mkpkg_xbmc-frodo                  | 81 -------------------
 tools/mkpkg/mkpkg_xbmc-pvr-addons-frodo       | 43 ----------
 11 files changed, 16 insertions(+), 216 deletions(-)
 delete mode 100755 tools/mkpkg/mkpkg_xbmc-addon-xvdr-frodo
 delete mode 100755 tools/mkpkg/mkpkg_xbmc-frodo
 delete mode 100755 tools/mkpkg/mkpkg_xbmc-pvr-addons-frodo

diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta
index 45d312c7f..756479118 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta
+++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta
@@ -19,10 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="e3cd383"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="cd5023b"
-fi
+PKG_VERSION="cd5023b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
index b919fd01e..e3a1a993c 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta
@@ -19,10 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="33afe59"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="6249892"
-fi
+PKG_VERSION="6249892"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/mediacenter/xbmc-addon-xvdr/meta
index c6a97048e..c99b4eae7 100644
--- a/packages/mediacenter/xbmc-addon-xvdr/meta
+++ b/packages/mediacenter/xbmc-addon-xvdr/meta
@@ -19,10 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-PKG_VERSION="frodo-acd4e14"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="6c95579"
-fi
+PKG_VERSION="6c95579"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-pvr-addons/package.mk b/packages/mediacenter/xbmc-pvr-addons/package.mk
index eafdd1fc6..5d55a7c43 100644
--- a/packages/mediacenter/xbmc-pvr-addons/package.mk
+++ b/packages/mediacenter/xbmc-pvr-addons/package.mk
@@ -19,10 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="frodo-910d7e7"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="cd5023b"
-fi
+PKG_VERSION="cd5023b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index d9780e28c..4e95564cd 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,10 +19,8 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.2-9714e7e"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="13.alpha-923f1c8"
-elif [ "$XBMC" = "xbmc-aml" ]; then
+PKG_VERSION="13.alpha-923f1c8"
+if [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi
 PKG_REV="1"
diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 668588152..e43c5504a 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -19,9 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.2-9714e7e"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="13.alpha-923f1c8"
+PKG_VERSION="13.alpha-923f1c8"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi
@@ -217,13 +215,8 @@ else
 fi
 
 if [ "$AIRTUNES_SUPPORT" = yes ]; then
-  if [ "$XBMC" = master ]; then
-    PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libshairplay"
-    PKG_DEPENDS="$PKG_DEPENDS libshairplay"
-  else
-    PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libshairport"
-    PKG_DEPENDS="$PKG_DEPENDS libshairport"
-  fi
+  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libshairplay"
+  PKG_DEPENDS="$PKG_DEPENDS libshairplay"
   XBMC_AIRTUNES="--enable-airtunes"
 else
   XBMC_AIRTUNES="--disable-airtunes"
@@ -505,14 +498,12 @@ post_makeinstall_target() {
       cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/
     fi
 
-  if [ "$XBMC" = master ]; then
-    mkdir -p $INSTALL/usr/share/xbmc/system/settings
-      if [ -f $PROJECT_DIR/$PROJECT/xbmc/appliance.xml ]; then
-        cp $PROJECT_DIR/$PROJECT/xbmc/appliance.xml $INSTALL/usr/share/xbmc/system/settings
-      else
-        cp $PKG_DIR/config/appliance.xml $INSTALL/usr/share/xbmc/system/settings
-      fi
-  fi
+  mkdir -p $INSTALL/usr/share/xbmc/system/settings
+    if [ -f $PROJECT_DIR/$PROJECT/xbmc/appliance.xml ]; then
+      cp $PROJECT_DIR/$PROJECT/xbmc/appliance.xml $INSTALL/usr/share/xbmc/system/settings
+    else
+      cp $PKG_DIR/config/appliance.xml $INSTALL/usr/share/xbmc/system/settings
+    fi
 
   if [ "$XBMC_EXTRA_FONTS" = yes ]; then
     mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
diff --git a/packages/multimedia/ffmpeg/build b/packages/multimedia/ffmpeg/build
index 49263992d..c6804a666 100755
--- a/packages/multimedia/ffmpeg/build
+++ b/packages/multimedia/ffmpeg/build
@@ -53,12 +53,6 @@ else
   FFMPEG_VDPAU="--disable-vdpau"
 fi
 
-if [ "$XBMC" = "master" ]; then
-  FFMPEG_CONFIGURE=" "
-else
-  FFMPEG_CONFIGURE="--enable-fastdiv --enable-aandct --enable-golomb --enable-huffman --enable-lpc --disable-libdirac --disable-mlib --disable-iwmmxt --disable-mmi"
-fi
-
 case "$TARGET_ARCH" in
   arm)
       FFMPEG_CPU=""
@@ -205,7 +199,6 @@ cd $PKG_BUILD/
             --enable-zlib \
             --enable-asm \
             --disable-altivec \
-            $FFMPEG_CONFIGURE \
             $FFMPEG_CPU \
             $FFMPEG_FPU \
             --disable-vis \
diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta
index 98034ab43..7cdbe50de 100644
--- a/packages/multimedia/ffmpeg/meta
+++ b/packages/multimedia/ffmpeg/meta
@@ -19,10 +19,7 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="0.10.7"
-if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="1.2.3"
-fi
+PKG_VERSION="1.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
diff --git a/tools/mkpkg/mkpkg_xbmc-addon-xvdr-frodo b/tools/mkpkg/mkpkg_xbmc-addon-xvdr-frodo
deleted file mode 100755
index ea21de440..000000000
--- a/tools/mkpkg/mkpkg_xbmc-addon-xvdr-frodo
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d xbmc-addon-xvdr-frodo.git ]; then
-    git clone git://github.com/pipelka/xbmc-addon-xvdr.git -b xbmc-frodo xbmc-addon-xvdr-frodo.git
-  fi
-
-  cd xbmc-addon-xvdr-frodo.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf xbmc-addon-xvdr-frodo-$GIT_REV
-  cp -R xbmc-addon-xvdr-frodo.git xbmc-addon-xvdr-frodo-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf xbmc-addon-xvdr-frodo-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf xbmc-addon-xvdr-frodo-$GIT_REV.tar.xz xbmc-addon-xvdr-frodo-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf xbmc-addon-xvdr-frodo-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo
deleted file mode 100755
index 46f402b99..000000000
--- a/tools/mkpkg/mkpkg_xbmc-frodo
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="xbmc"
-PKG_VERSION="12.2.0"
-GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
-DEST_DIR="$PKG_NAME-frodo"
-
-echo "getting sources..."
-  if [ ! -d $DEST_DIR-latest ]; then
-    git clone $GIT_REPO $DEST_DIR-latest
-  fi
-
-  cd $DEST_DIR-latest
-    git pull
-
-    echo "getting version..."
-      GIT_REV=`git log -n1 --format=%h`
-      echo $GIT_REV
-  cd ..
-
-  if [ -z "$PKG_VERSION" ]; then
-      PKG_VERSION="$GIT_REV"
-  fi
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
-  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
-  mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
-  rm -rf $PKG_NAME-$PKG_VERSION/project
-
-  for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
-           "PackageMaker" "Translator" "XBMCLive" "XprPack" \
-           "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
-  done
-
-  for i in dll a lib so bat; do
-    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
-  done
-
-  # bundled win32 binaries
-  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
-  tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
diff --git a/tools/mkpkg/mkpkg_xbmc-pvr-addons-frodo b/tools/mkpkg/mkpkg_xbmc-pvr-addons-frodo
deleted file mode 100755
index ce62e48c0..000000000
--- a/tools/mkpkg/mkpkg_xbmc-pvr-addons-frodo
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d xbmc-pvr-addons-frodo.git ]; then
-    git clone git://github.com/opdenkamp/xbmc-pvr-addons.git -b frodo xbmc-pvr-addons-frodo.git
-  fi
-
-  cd xbmc-pvr-addons-frodo.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf xbmc-pvr-addons-frodo-$GIT_REV
-  cp -R xbmc-pvr-addons-frodo.git xbmc-pvr-addons-frodo-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf xbmc-pvr-addons-frodo-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf xbmc-pvr-addons-frodo-$GIT_REV.tar.xz xbmc-pvr-addons-frodo-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf xbmc-pvr-addons-frodo-$GIT_REV