Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

packages/accessibility/atk/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="atk"
-PKG_VERSION="2.0.0"
+PKG_VERSION="2.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/service/softcam/oscam/addon

@@ -24,7 +24,7 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
 
 

packages/addons/service/softcam/oscam/build

@@ -24,5 +24,11 @@
 . config/options $1
 
 cd $PKG_BUILD
-cmake -DWEBIF=1
+mkdir -p build && cd build
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWEBIF=1 \
+      ..
+
 make

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,2 +1,5 @@
+0.99.2
+- update to oscam-5386
+
 0.99.1
 - initial version oscam-5377

packages/addons/service/softcam/oscam/meta

@@ -20,15 +20,14 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="5377"
+PKG_VERSION="5386"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
-#PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_URL="http://gujs.openelec.tv/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS="libiconv avahi openssl"
-PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="openssl"
+PKG_BUILD_DEPENDS="toolchain openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/softcam"
 PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."

packages/addons/service/softcam/oscam/source/bin/oscam.service

@@ -21,7 +21,7 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-#Check if process is already running
+# Check if process is already running
 if [ ! $(pidof oscam) ]; then
 
   ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam"
@@ -64,10 +64,11 @@ if [ ! $(pidof oscam) ]; then
   touch $ADDON_CONF_TIERS
   touch $ADDON_CONF_USER
 
-#Restart process if it terminates.
-  (while true; do
-    oscam $OSCAM_ARG  > /dev/null 2>&1
-    sleep 1
-  done)&
+# Restart process if it terminates.
+  (
+    while true; do
+      oscam $OSCAM_ARG > /dev/null 2>&1
+      usleep 250000
+    done
+  )&
 fi
-

packages/compress/zlib-host/build

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+$SCRIPTS/unpack zlib
+
+setup_toolchain host
+
+cd $BUILD/zlib-*
+
+# needed for building with cmake
+  rm -rf zconf.h
+
+mkdir -p .build-host && cd .build-host
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
+      ..
+
+make
+make install

packages/compress/zlib-host/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="zlib-host"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.zlib.net"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="compress"
+PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
+PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/compress/zlib/build

@@ -23,8 +23,15 @@
 . config/options $1
 
 cd $PKG_BUILD
-./configure --prefix=/usr --shared
+
+# needed for building with cmake
+  rm -rf zconf.h
+
+mkdir -p .build-target && cd .build-target
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      ..
 
 make
-
 $MAKEINSTALL

packages/compress/zlib/install

@@ -23,4 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib
+  cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib

packages/debug/strace/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="strace"
-PKG_VERSION="4.5.20"
+PKG_VERSION="4.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://sourceforge.net/projects/strace/"
-PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/devel/glib-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain gtk-doc"
+PKG_BUILD_DEPENDS="toolchain gtk-doc zlib-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib-host: C support library"

packages/devel/libimobiledevice/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libimobiledevice"
-PKG_VERSION="1.0.4"
+PKG_VERSION="1.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/tiff/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tiff"
-PKG_VERSION="4.0.0beta6"
+PKG_VERSION="4.0.0beta7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/initramfs/compress/zlib-initramfs/install

@@ -25,4 +25,4 @@
 ZLIB_DIR="$BUILD/zlib-*"
 
 mkdir -p $INSTALL/lib
-  cp -R $ZLIB_DIR/*.so* $INSTALL/lib
+  cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib

packages/lang/Python/build

@@ -39,8 +39,12 @@ LDFLAGS="$LDFLAGS -lexpat" \
              --with-threads \
              --enable-unicode=ucs4 \
 
-make
-make install
+make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib"
+
+make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \
+     install
 
 # symlink python binary to python2 (needed for Mesa)
   ln -sf python $ROOT/$TOOLCHAIN/bin/python2

packages/lang/Python/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
 PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="zlib openssl libffi file"
-PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib openssl libffi"
+PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib-host zlib openssl libffi"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="python: The Python programming language"

packages/linux-firmware/dvb-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.7"
+PKG_VERSION="0.0.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="eedceeb"
+PKG_VERSION="538d8e1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="eedceeb"
+PKG_VERSION="538d8e1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-538d8e1-322-add_sshd_dialog-0.1.patch

@@ -0,0 +1,97 @@
+diff --git a/language/English/strings.xml b/language/English/strings.xml
+index 1583695..bdea670 100644
+--- a/language/English/strings.xml
++++ b/language/English/strings.xml
+@@ -1728,6 +1728,7 @@
+   <string id="20257">VDR Streamdev client</string>
+   <string id="20258">MythTV client</string>
+   <string id="20259">Network Filesystem (NFS)</string>
++  <string id="20260">Secure Shell (SSH/SFTP)</string>
+ 
+   <string id="20300">Web server directory (HTTP)</string>
+   <string id="20301">Web server directory (HTTPS)</string>
+diff --git a/xbmc/network/GUIDialogNetworkSetup.cpp b/xbmc/network/GUIDialogNetworkSetup.cpp
+index b39efd4..fc274f9 100644
+--- a/xbmc/network/GUIDialogNetworkSetup.cpp
++++ b/xbmc/network/GUIDialogNetworkSetup.cpp
+@@ -144,6 +144,9 @@ void CGUIDialogNetworkSetup::OnInitWindow()
+ #ifdef HAS_FILESYSTEM_NFS
+   pSpin->AddLabel(g_localizeStrings.Get(20259), NET_PROTOCOL_NFS);
+ #endif
++#ifdef HAS_FILESYSTEM_SFTP
++  pSpin->AddLabel(g_localizeStrings.Get(20260), NET_PROTOCOL_SFTP);
++#endif
+ 
+   pSpin->SetValue(m_protocol);
+   OnProtocolChange();
+@@ -210,6 +213,8 @@ void CGUIDialogNetworkSetup::OnProtocolChange()
+     m_port = "6543";
+   else if (m_protocol == NET_PROTOCOL_NFS)
+     m_port = "2049";
++  else if (m_protocol == NET_PROTOCOL_SFTP)
++    m_port = "22";
+ 
+   UpdateButtons();
+ }
+@@ -244,6 +249,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
+       m_protocol == NET_PROTOCOL_RSS ||
+       m_protocol == NET_PROTOCOL_DAV ||
+       m_protocol == NET_PROTOCOL_DAVS||
++      m_protocol == NET_PROTOCOL_SFTP||
+       m_protocol == NET_PROTOCOL_NFS)
+   {
+     SET_CONTROL_LABEL(CONTROL_REMOTE_PATH, 1011);  // Remote Path
+@@ -276,6 +282,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
+                                                    m_protocol == NET_PROTOCOL_MYTH ||
+                                                    m_protocol == NET_PROTOCOL_RSS ||
+                                                    m_protocol == NET_PROTOCOL_DAAP ||
++                                                   m_protocol == NET_PROTOCOL_SFTP ||
+                                                    m_protocol == NET_PROTOCOL_NFS);
+ 
+   SendMessage(GUI_MSG_SET_TYPE, CONTROL_PORT_NUMBER, CGUIEditControl::INPUT_TYPE_NUMBER, 1018);
+@@ -302,6 +309,7 @@ void CGUIDialogNetworkSetup::UpdateButtons()
+                                                                               m_protocol == NET_PROTOCOL_VTP ||
+                                                                               m_protocol == NET_PROTOCOL_MYTH ||
+                                                                               m_protocol == NET_PROTOCOL_TUXBOX||
++                                                                              m_protocol == NET_PROTOCOL_SFTP ||
+                                                                               m_protocol == NET_PROTOCOL_NFS));
+ }
+ 
+@@ -336,6 +344,8 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const
+     url.SetProtocol("myth");
+   else if (m_protocol == NET_PROTOCOL_NFS)
+     url.SetProtocol("nfs");
++  else if (m_protocol == NET_PROTOCOL_SFTP)
++    url.SetProtocol("sftp");
+     
+   if (!m_username.IsEmpty())
+   {
+@@ -356,6 +366,7 @@ CStdString CGUIDialogNetworkSetup::ConstructPath() const
+        (m_protocol == NET_PROTOCOL_VTP) ||
+        (m_protocol == NET_PROTOCOL_MYTH) ||
+        (m_protocol == NET_PROTOCOL_TUXBOX) ||
++       (m_protocol == NET_PROTOCOL_SFTP) ||
+        (m_protocol == NET_PROTOCOL_NFS))
+       && !m_port.IsEmpty() && atoi(m_port.c_str()) > 0)
+   {
+@@ -398,6 +409,8 @@ void CGUIDialogNetworkSetup::SetPath(const CStdString &path)
+     m_protocol = NET_PROTOCOL_RSS;
+   else if (protocol == "nfs")
+     m_protocol = NET_PROTOCOL_NFS;
++  else if (protocol == "sftp" || protocol == "ssh")
++    m_protocol = NET_PROTOCOL_SFTP;
+   else
+     m_protocol = NET_PROTOCOL_SMB;  // default to smb
+   m_username = url.GetUserName();
+diff --git a/xbmc/network/GUIDialogNetworkSetup.h b/xbmc/network/GUIDialogNetworkSetup.h
+index 42dfa03..ec4c799 100644
+--- a/xbmc/network/GUIDialogNetworkSetup.h
++++ b/xbmc/network/GUIDialogNetworkSetup.h
+@@ -41,6 +41,7 @@ public:
+                       NET_PROTOCOL_VTP,
+                       NET_PROTOCOL_MYTH,
+                       NET_PROTOCOL_TUXBOX,
++                      NET_PROTOCOL_SFTP,
+                       NET_PROTOCOL_NFS};
+   CGUIDialogNetworkSetup(void);
+   virtual ~CGUIDialogNetworkSetup(void);

packages/multimedia/libass/build

@@ -31,7 +31,8 @@ cd $PKG_BUILD
             --datadir=/usr/share \
             --enable-shared \
             --disable-static \
+            --enable-enca \
 
 make
 
-$MAKEINSTALL
+$MAKEINSTALL

packages/multimedia/libass/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libass"
-PKG_VERSION="0.9.11"
+PKG_VERSION="0.9.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://code.google.com/p/libass/"
-PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="freetype fontconfig enca"
 PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca"
 PKG_PRIORITY="optional"

packages/network/cifs-utils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cifs-utils"
-PKG_VERSION="4.8.1"
+PKG_VERSION="5.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/ethtool/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="ethtool"
-PKG_VERSION="2.6.36"
+PKG_VERSION="2.6.39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://sourceforge.net/projects/gkernel/"
-PKG_URL="$SOURCEFORGE_SRC/gkernel/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
+PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/network/libssh/install

@@ -23,4 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/build/src/*.so* $INSTALL/usr/lib

packages/network/libssh/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libssh"
-PKG_VERSION="0.4.8"
+PKG_VERSION="0.5.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.libssh.org/"
-PKG_URL="http://www.libssh.org/files/0.4/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.libssh.org/files/0.5/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="zlib libgcrypt"
 PKG_BUILD_DEPENDS="toolchain zlib libgcrypt"
 PKG_PRIORITY="optional"

packages/network/samba/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="samba"
-PKG_VERSION="3.5.8"
+PKG_VERSION="3.5.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/python/devel/pygobject/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pygobject"
-PKG_VERSION="2.28.4"
+PKG_VERSION="2.28.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/python/system/simplejson/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="simplejson"
-PKG_VERSION="2.1.3"
+PKG_VERSION="2.1.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/sysutils/usbutils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="usbutils"
-PKG_VERSION="0.91"
+PKG_VERSION="003"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/textproc/libxml2-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain Python"
+PKG_BUILD_DEPENDS="toolchain zlib-host Python"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="libxml: XML parser library for Gnome"

packages/toolchain/devel/ccache/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ccache"
-PKG_VERSION="3.1.4"
+PKG_VERSION="3.1.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/x11/driver/xf86-video-fglrx/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="11.5"
+PKG_VERSION="11.6"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"

packages/x11/toolkits/gtk+/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gtk+"
-PKG_VERSION="2.24.4"
+PKG_VERSION="2.24.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/toolkits/gtk-doc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gtk-doc"
-PKG_VERSION="1.15"
+PKG_VERSION="1.17"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/x11/toolkits/pango/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="pango"
-PKG_VERSION="1.28.4"
+PKG_VERSION="1.29.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.29/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft"
 PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft"
 PKG_PRIORITY="optional"

scripts/checkdeps

@@ -35,8 +35,8 @@ case $1 in
   build)
     deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
     deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
-    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h /usr/include/SDL/SDL.h /usr/include/SDL/SDL_image.h /usr/include/lzo/lzo1.h"
-    files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev libSDL-devel libSDL_image-devel lzo-devel"
+    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h"
+    files_pkg="glibc-static libc6-dev libncurses5-dev"
     ;;
   qemu)
     if [ ! `which qemu` ]; then

scripts/extract

@@ -51,6 +51,9 @@ for i in $PKG_URL; do
       *.tar.gz | *.tgz)
         tar xzf $f -C $3
         ;;
+      *.tar.xz | *.txz)
+        tar xJf $f -C $3
+        ;;
       *.7z)
         mkdir -p $3/$1
         7z x -o$3/$1 $f

scripts/unpack

@@ -58,7 +58,10 @@ rm -rf $BUILD/$1[-_]git*
 
 if [ -n "$PKG_URL" ]; then
   $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+  $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
   $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+  $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+  $SCRIPTS/extract $1 "$1*.txz"     $BUILD
   $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
   $SCRIPTS/extract $1 "$1*.7z"      $BUILD
 fi