Merge branch 'testing' of ssh://git.chakraos.org:86/platform into testing

2025-02-03 13:47:14 +08:00 · 2015-03-21 21:24:36 +00:00 · 2015-03-21 21:24:36 +00:00 · b8868afda6
commit b8868afda6
parent 3b43bbc841 6432d61c2e
14 changed files with 397 additions and 118 deletions
--- a/cdparanoia/PKGBUILD
+++ b/cdparanoia/PKGBUILD
@ -1,23 +1,30 @@
-# $Id: PKGBUILD 53530 2009-10-02 03:48:49Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/cdparanoia

 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Compact Disc Digital Audio extraction tool"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.xiph.org/paranoia/"
 license=('GPL')
 depends=('glibc')
-options=('!makeflags')
+options=('!makeflags' '!staticlibs')
 source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch)
-md5sums=('b304bbe8ab63373924a744eac9ebc652' '12da14958d2b84c6719fe69890436445')
-sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' '67faaf0e3eed2e3de6f66d8168604bc6c7295921')
+md5sums=('b304bbe8ab63373924a744eac9ebc652'
+         '12da14958d2b84c6719fe69890436445')
+
+prepare() {
+  cd "$srcdir/cdparanoia-III-$pkgver"
+  patch -p0 -i ${srcdir}/gcc.patch
+}

 build() {
  cd "$srcdir/cdparanoia-III-$pkgver"
-  patch -p0 -i ${srcdir}/gcc.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man 
+  make
+}
+  
+package() {
+  cd "$srcdir/cdparanoia-III-$pkgver"
+  make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install
 }
--- a/intel-ucode/PKGBUILD
+++ b/intel-ucode/PKGBUILD
@ -2,7 +2,7 @@
 # Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/intel-ucode

 pkgname=intel-ucode
-pkgver=20140913
+pkgver=20150121
 pkgrel=1
 pkgdesc="Microcode update files for Intel CPUs"
 arch=('any')
@ -10,14 +10,13 @@ url="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22micro
 replaces=('microcode_ctl')
 license=('custom')
 # Some random "download id" that intel has in their downloadcenter
-_dlid=24290
+_dlid=24661
 source=(http://downloadmirror.intel.com/${_dlid}/eng/microcode-${pkgver}.tgz
        LICENSE
        intel-microcode2ucode.c)
-md5sums=('d589dbdbc1b0498f95a6702e46569998'
-         'b0f489ae4b3e36dc8827dc53a76047aa'
-         '0efc5f6c74a4d7e61ca22683c93c98cf')
-
+sha256sums=('23353b93bb421971496cea5e9f9d390ce0ed22580a8cc45ae7b3b322dcd8f6b3'
+            '6983e83ec10c6467fb9101ea496e0443f0574c805907155118e2c9f0bbea97b6'
+            'c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de')
 build() {
  cd "$srcdir"
  gcc -Wall ${CFLAGS} -o intel-microcode2ucode intel-microcode2ucode.c
@ -25,6 +24,9 @@ build() {
 }

 package() {
+  # for packagers who want to update:
+  # We don't use same method as arch linux for microcode
+  # copy it to /usr/lib/firmware/intel-ucode/ is the right way to go for chakra
  cd "$srcdir"
  install -d -m755 "${pkgdir}"/usr/lib/firmware/intel-ucode/
  cp intel-ucode/* "${pkgdir}"/usr/lib/firmware/intel-ucode/
--- a/kdeclarative/PKGBUILD
+++ b/kdeclarative/PKGBUILD
@ -8,7 +8,7 @@ pkgdesc='Provides integration of QML and KDE Frameworks'
 arch=('x86_64')
 url='https://projects.kde.org/projects/frameworks/kdeclarative'
 license=('LGPL')
-depends=('kio' 'libepoxy')
+depends=('kio' 'libepoxy' 'kpackage')
 makedepends=("extra-cmake-modules>=${KFECMVersion}")
 groups=('kf5')
 options=("debug")
--- a/kdoctools/PKGBUILD
+++ b/kdoctools/PKGBUILD
@ -10,7 +10,7 @@ arch=('x86_64')
 url='https://projects.kde.org/projects/frameworks/kdoctools'
 license=('LGPL')
 depends=('karchive' 'docbook-xsl')
-makedepends=("extra-cmake-modules>=${KFECMVersion}" "ki18n" "python3")
+makedepends=("extra-cmake-modules>=${KFECMVersion}" "ki18n" "python3" "perl-uri")
 groups=('kf5')
 options=('staticlibs' 'debug')
 source=("${KFServer}/${pkgname}-${pkgver}.tar.xz")
@ -27,10 +27,10 @@ build() {
  make
 }

-check() {
-  cd build
-  make test
-}
+# check() {
+#   cd build
+#   make test
+# }

 package() {
  cd build
--- a/kpeople/PKGBUILD
+++ b/kpeople/PKGBUILD
@ -1,17 +1,16 @@

 source ../frameworks.conf

-pkgname=kxmlrpcclient
-pkgver=${KFVersion}
+pkgname=kpeople
+pkgver=5.8.0
 pkgrel=1
-pkgdesc='A contact aggregation library for KDE'
+pkgdesc='A library that provides access to all contacts and the people who hold them'
 arch=('x86_64')
 url='http://community.kde.org/KTp/libkpeople'
-license=('LGPL')
-depends=('baloo' 'kcoreaddons' 'kservice' 'kwidgetsaddons' 'ki18n' 'kitemviews')
-makedepends=("extra-cmake-modules>=${KFECMVersion}" 'boost')
-groups=('kf5')
-install=kio.install
+license=(LGPL)
+depends=('kservice' 'kwidgetsaddons' 'kitemviews' "qt5-declarative=${KFQtVersion}")
+makedepends=("extra-cmake-modules>=${KFECMVersion}" 'python')
+groups=(kf5)
 options=("debug")
 source=("${KFServer}/${pkgname}-${pkgver}.tar.xz")
 sha256sums=( $(getSum ${pkgname}) )
@ -20,14 +19,17 @@ prepare() {
  mkdir -p build
 }

-build() {
+build() { 
  cd build
-  cmake_kf5 ../${pkgname}-${pkgver}
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
  make
 }

 package() {
  cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
- 
--- a/libmpeg2/PKGBUILD
+++ b/libmpeg2/PKGBUILD
@ -1,29 +1,41 @@
-# $Id: PKGBUILD 8677 2008-08-15 11:05:35Z andyrtr $
-# Contributor: Sarah Hay <sarah@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/libmpeg2

 pkgname=libmpeg2
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://libmpeg2.sourceforge.net/"
 depends=('glibc')
 makedepends=('sdl' 'libxv' 'libsm')
-optdepends=('sdl:	requiered for mpeg2dec'
-            'libsm:	requiered for mpeg2dec'
-            'libxv:	requiered for mpeg2dec')
-source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz)
+optdepends=('sdl:	required for mpeg2dec'
+            'libsm:	required for mpeg2dec'
+            'libxv:	required for mpeg2dec')
 license=('GPL2')
 options=(!libtool)
 provides=('mpeg2dec')
-md5sums=('0f92c7454e58379b4a5a378485bbd8ef')
+source=("http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
+        'gcc4.6.patch')
+md5sums=('0f92c7454e58379b4a5a378485bbd8ef'
+         'ff73b3f77870baf8de69441f34b88fa5')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gcc4.6.patch"
+
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf --force --install
+}

 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-shared --disable-static || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-shared --disable-static
  make	OPT_CFLAGS="${CFLAGS}" \
 	MPEG2DEC_CFLAGS="${CFLAGS}" \
-	LIBMPEG2_CFLAGS="" || return 1
-  make DESTDIR=${pkgdir} install || return 1
+	LIBMPEG2_CFLAGS=""
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
--- a/libmpeg2/gcc4.6.patch
+++ b/libmpeg2/gcc4.6.patch
@ -0,0 +1,128 @@
+--- libmpeg2-0.5.1/libmpeg2/idct_mmx.c.orig	2011-05-13 09:23:02.557758717 -0300
+++ libmpeg2-0.5.1/libmpeg2/idct_mmx.c	2011-05-13 09:23:06.346778580 -0300
+@@ -39,7 +39,6 @@
+ #define rounder(bias) {round (bias), round (bias)}
+ #define rounder_sse2(bias) {round (bias), round (bias), round (bias), round (bias)}
+ 
+-
+ #if 0
+ /* C row IDCT - it is just here to document the MMXEXT and MMX versions */
+ static inline void idct_row (int16_t * row, int offset,
+@@ -464,10 +463,10 @@ static inline void sse2_idct_col (int16_
+     /* Almost identical to mmxext version:  */
+     /* just do both 4x8 columns in paraller */
+ 
+-    static const short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
+-    static const short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
+-    static const short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
+-    static const short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
+    static/* const*/ short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
+    static/* const*/ short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
+    static/* const*/ short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
+    static/* const*/ short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
+ 
+ #if defined(__x86_64__)
+ 
+@@ -710,10 +709,10 @@ static inline void sse2_idct_col (int16_
+ /* MMX column IDCT */
+ static inline void idct_col (int16_t * const col, const int offset)
+ {
+-    static const short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
+-    static const short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
+-    static const short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
+-    static const short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
+    static/* const*/ short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
+    static/* const*/ short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
+    static/* const*/ short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
+    static/* const*/ short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
+ 
+     /* column code adapted from peter gubanov */
+     /* http://www.elecard.com/peter/idct.shtml */
+@@ -847,33 +846,33 @@ static inline void idct_col (int16_t * c
+ }
+ 
+ 
+-static const int32_t rounder0[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder0[] ATTR_ALIGN(8) =
+     rounder ((1 << (COL_SHIFT - 1)) - 0.5);
+-static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
+-static const int32_t rounder1[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
+static/* const*/ int32_t rounder1[] ATTR_ALIGN(8) =
+     rounder (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
+-static const int32_t rounder7[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder7[] ATTR_ALIGN(8) =
+     rounder (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
+-static const int32_t rounder2[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder2[] ATTR_ALIGN(8) =
+     rounder (0.60355339059);	/* C2 * (C6+C2)/2 */
+-static const int32_t rounder6[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder6[] ATTR_ALIGN(8) =
+     rounder (-0.25);		/* C2 * (C6-C2)/2 */
+-static const int32_t rounder3[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder3[] ATTR_ALIGN(8) =
+     rounder (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
+-static const int32_t rounder5[] ATTR_ALIGN(8) =
+static/* const*/ int32_t rounder5[] ATTR_ALIGN(8) =
+     rounder (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
+ 
+ 
+ #define declare_idct(idct,table,idct_row_head,idct_row,idct_row_tail,idct_row_mid)	\
+ static inline void idct (int16_t * const block)				\
+ {									\
+-    static const int16_t table04[] ATTR_ALIGN(16) =			\
+    static/* const*/ int16_t table04[] ATTR_ALIGN(16) =			\
+ 	table (22725, 21407, 19266, 16384, 12873,  8867, 4520);		\
+-    static const int16_t table17[] ATTR_ALIGN(16) =			\
+    static/* const*/ int16_t table17[] ATTR_ALIGN(16) =			\
+ 	table (31521, 29692, 26722, 22725, 17855, 12299, 6270);		\
+-    static const int16_t table26[] ATTR_ALIGN(16) =			\
+    static/* const*/ int16_t table26[] ATTR_ALIGN(16) =			\
+ 	table (29692, 27969, 25172, 21407, 16819, 11585, 5906);		\
+-    static const int16_t table35[] ATTR_ALIGN(16) =			\
+    static/* const*/ int16_t table35[] ATTR_ALIGN(16) =			\
+ 	table (26722, 25172, 22654, 19266, 15137, 10426, 5315);		\
+ 									\
+     idct_row_head (block, 0*8, table04);				\
+@@ -900,29 +899,29 @@ static inline void idct (int16_t * const
+ 
+ static inline void sse2_idct (int16_t * const block)
+ {
+-    static const int16_t table04[] ATTR_ALIGN(16) =
+    static/* const*/ int16_t table04[] ATTR_ALIGN(16) =
+ 	sse2_table (22725, 21407, 19266, 16384, 12873,  8867, 4520);
+-    static const int16_t table17[] ATTR_ALIGN(16) =
+    static/* const*/ int16_t table17[] ATTR_ALIGN(16) =
+ 	sse2_table (31521, 29692, 26722, 22725, 17855, 12299, 6270);
+-    static const int16_t table26[] ATTR_ALIGN(16) =
+    static/* const*/ int16_t table26[] ATTR_ALIGN(16) =
+ 	sse2_table (29692, 27969, 25172, 21407, 16819, 11585, 5906);
+-    static const int16_t table35[] ATTR_ALIGN(16) =
+    static/* const*/ int16_t table35[] ATTR_ALIGN(16) =
+ 	sse2_table (26722, 25172, 22654, 19266, 15137, 10426, 5315);
+ 
+-    static const int32_t rounder0_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder0_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 ((1 << (COL_SHIFT - 1)) - 0.5);
+-    static const int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
+-    static const int32_t rounder1_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
+    static/* const*/ int32_t rounder1_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
+-    static const int32_t rounder7_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder7_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
+-    static const int32_t rounder2_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder2_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (0.60355339059);	/* C2 * (C6+C2)/2 */
+-    static const int32_t rounder6_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder6_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (-0.25);		/* C2 * (C6-C2)/2 */
+-    static const int32_t rounder3_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder3_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
+-    static const int32_t rounder5_128[] ATTR_ALIGN(16) =
+    static/* const*/ int32_t rounder5_128[] ATTR_ALIGN(16) =
+ 	rounder_sse2 (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
+ 
+ #if defined(__x86_64__)
--- a/maxima/PKGBUILD
+++ b/maxima/PKGBUILD
@ -2,7 +2,7 @@

 pkgname=maxima
 pkgver=5.35.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated Computer Algebra System."
 arch=('x86_64')
 license=('GPL')
--- a/mplayer/PKGBUILD
+++ b/mplayer/PKGBUILD
@ -1,97 +1,116 @@
-#
-# Platform packages of Chakra Project, part of chakra-project.org
-#
-# Contributor: abveritas@chakra-project.org
-# Maintainer: Bruce Liu <rainman59118@gmail.com>
-
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37344
-pkgrel=3
+pkgver=37379
+pkgrel=1
 arch=('x86_64')
-makedepends=('subversion' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
-             'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
-             'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
-             'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
-             'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-             'libcdio' 'opus')
-license=('GPL2')
-url="http://www.mplayerhq.hu/"
+makedepends=(
+  'subversion' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+  'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+  'faac' 'faad2' 'lirc'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+  'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+  'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'rtmpdump' 'gnutls'
+  'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
+)
+license=('GPL')
+url='http://www.mplayerhq.hu/'
 categories=('multimedia')
 screenshot=("http://www.mplayerhq.hu/images/screenshots/gui-preview-01.jpg")
-install=mplayer.install
-source=("${pkgname}::svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
-        "http://ffmpeg.org/releases/ffmpeg-2.5.2.tar.bz2"
+options=('!buildflags' '!emptydirs')
+source=("${pkgbase}-${pkgver}::svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
+        "http://ffmpeg.org/releases/ffmpeg-2.6.tar.bz2"
        mplayer.desktop
-        mplayer.png
-        include-samba-4.0.patch)
+        cdio-includes.patch
+        include-samba-4.0.patch
+        revert-icl-fixes.patch)
 md5sums=('SKIP'
-         '308d49d91752ac00ded9483ebaab849d'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
-         'd00874ccc644b7f43d6ef1c942fcef28'
-         '868a92bdef148df7f38bfa992b26ce9d')
+         '5bf6097833a3fea6a9e51b0a456c6922'
+         '62f44a58f072b2b1a3c3d3e4976d64b3'
+         '7b5be7191aafbea64218dc4916343bbc'
+         '868a92bdef148df7f38bfa992b26ce9d'
+         '3579402002b7302fdf2d146639333efd')

 prepare() {
-    cd ${pkgbase}
-    mv ../ffmpeg-*/ ./ffmpeg
+  cd $pkgbase-$pkgver
+  mv ../ffmpeg-*/ ./ffmpeg

-    patch -p1 -i ../include-samba-4.0.patch
+  patch -p0 -i ../cdio-includes.patch
+  patch -p1 -i ../include-samba-4.0.patch
+  patch -Np0 -i ../revert-icl-fixes.patch
+
+  ./version.sh
 }

 build() {
-    cd ${srcdir}/${pkgbase}
+  cd $pkgbase-$pkgver

-    # Custom CFLAGS break the mplayer build
-    unset CFLAGS LDFLAGS
+  ./configure --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --disable-speex \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --disable-cdparanoia \
+    --enable-xvmc \
+    --enable-radio \
+    --enable-radio-capture \
+    --enable-smb \
+    --language=all \
+    --confdir=/etc/mplayer

-    ./configure \
-      --confdir=/etc/mplayer \
-      --enable-runtime-cpudetection \
-      --enable-smb \
-      --language=all \
-      --prefix=/usr
-
-    make
+  make
 }

 package_mplayer() {
  pkgdesc="A movie player for linux"
  install=mplayer.install
  backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-  depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx'
-           'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
-           'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
-           'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca'
-           'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
-           'libass' 'libxxf86vm' 'libbluray' 'libcdio' 'opus')
+  depends=(
+    'desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx'
+    'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+    'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+    'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+    'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+    'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
+    'gsm' 'gnutls' 'libdvdnav' 'giflib'
+  )
  provides=('mplayer2')
  replaces=('mplayer2')
-  conflics=('mplayer2')
-
-  cd ${srcdir}/${pkgname}
+  conflicts=('mplayer2')

+  cd $pkgbase-$pkgver
  make DESTDIR=${pkgdir} install-mplayer install-mplayer-man

-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+    "${pkgdir}/etc/mplayer/"

  install -dm755 ${pkgdir}/usr/share/mplayer/
  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
  rm -rf ${pkgdir}/usr/share/mplayer/font

  # Desktop Integration.
-  install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
-  install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+  install -Dm644 ../mplayer.desktop \
+    "$pkgdir"/usr/share/applications/mplayer.desktop
+  install -Dm644 etc/mplayer256x256.png \
+    "$pkgdir"/usr/share/pixmaps/mplayer.png
 }

 package_mencoder() {
-  pkgdesc="Free command line video decoding, encoding and filtering tool"
-  depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
-           'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
-           'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
-           'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio'
-           'libvorbis' 'opus')
-           
-  cd $pkgbase
-  make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+  pkgdesc='Free command line video decoding, encoding and filtering tool'
+  depends=(
+    'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+    'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+    'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
+    'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+    'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav'
+  )
+
+  make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
  find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
 }
--- a/mplayer/cdio-includes.patch
+++ b/mplayer/cdio-includes.patch
@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
+++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
+++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+ 
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
+#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
+++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
--- a/mplayer/mplayer.desktop
+++ b/mplayer/mplayer.desktop
@ -19,3 +19,4 @@ Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
 MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
--- a/mplayer/mplayer.png
+++ b/mplayer/mplayer.png
--- a/mplayer/revert-icl-fixes.patch
+++ b/mplayer/revert-icl-fixes.patch
@ -0,0 +1,66 @@
+Index: libmpcodecs/vf_fspp.c
+===================================================================
+--- libmpcodecs/vf_fspp.c	(revision 37183)
+++ libmpcodecs/vf_fspp.c	(revision 37181)
+@@ -1598,10 +1598,6 @@
+ 
+         : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps)
+         : "d"(thr_adr)
+-          NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433,
+-          ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065)
+-          NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065,
+-          MM_FIX_1_082392200)
+         : "%"REG_a
+         );
+ }
+@@ -1871,8 +1867,6 @@
+ 
+         : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps)
+         : "a"(output_stride*sizeof(short))
+-        NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200,
+-        MM_FIX_1_414213562,MM_DESCALE_RND)
+         : "%"REG_d
+         );
+ }
+@@ -1980,10 +1974,10 @@
+         "movd (%%"REG_S",%%"REG_a",2), %%mm3    \n\t" //5
+         "paddw %%mm4, %%mm1            \n\t"
+ 
+-        "movq %%mm5, %3                \n\t" //t7
+        "movq %%mm5, 0*8+%3            \n\t" //t7
+         "punpcklbw %%mm7, %%mm3        \n\t"
+ 
+-        "movq %%mm6, %4                \n\t" //t6
+        "movq %%mm6, 1*8+%3            \n\t" //t6
+         "movq %%mm2, %%mm4             \n\t"
+ 
+         "movd (%%"REG_S"), %%mm5           \n\t" //3
+@@ -2029,7 +2023,7 @@
+         "psubw %%mm1, %%mm5            \n\t" //d1
+         "movq %%mm0, %%mm6             \n\t"
+ 
+-        "movq %4, %%mm1                \n\t"
+        "movq 1*8+%3, %%mm1            \n\t"
+         "punpcklwd %%mm5, %%mm0        \n\t"
+ 
+         "punpckhwd %%mm5, %%mm6        \n\t"
+@@ -2053,7 +2047,7 @@
+         "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
+         "psllw $2, %%mm3              \n\t" //t10
+ 
+-        "movq %3, %%mm2               \n\t"
+        "movq 0*8+%3, %%mm2           \n\t"
+         "psllw $2, %%mm4              \n\t" //t11
+ 
+         "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3
+@@ -2116,9 +2110,8 @@
+         "dec %%"REG_c"                   \n\t"
+         "jnz 6b                  \n\t"
+ 
+-        : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1])
+        : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps)
+         : "a"(line_size)
+-        NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965)
+         : "%"REG_d);
+ }
+ 
--- a/sbcl/PKGBUILD
+++ b/sbcl/PKGBUILD
@ -1,7 +1,7 @@
-# Maintainer: abveritas[at]chakra-project[dot]org>
+# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/sbcl

 pkgname=sbcl
-pkgver=1.0.55
+pkgver=1.2.9
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=('x86_64')
@ -13,20 +13,19 @@ makedepends=('sbcl' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
        'chakra-fixes.lisp')
-md5sums=('128fb15c80e8e3f8d4024bd8e04635e0'
+md5sums=('e23592dd0e424239b0ddc40f0df44ab0'
         '7ac0c1936547f4278198b8bf7725204d')

-
-
 build() {
  cd "$srcdir/$pkgname-$pkgver"

-  export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
-  export GNUMAKE="make -e"
+  export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
+  export GNUMAKE="make"

  # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
  export LINKFLAGS="$LDFLAGS"
  unset LDFLAGS
+  unset MAKEFLAGS

  # Make a multi-threaded SBCL, disable LARGEFILE
  cat >customize-target-features.lisp <<EOF
@ -37,7 +36,7 @@ build() {
  (disable :largefile)))
 EOF

-  sh make.sh sbcl
+  sh make.sh sbcl --prefix=/usr
  make -C doc/manual info
 }