smplayer update, build with new mplayer, engine-qtcurve needs gtk makedep

This commit is contained in:
Anke 2012-04-14 05:52:19 +00:00
parent 0e475c0632
commit 679010e874
3 changed files with 15 additions and 49 deletions

View File

@ -3,9 +3,6 @@
# #
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=gtk-integration-engine-qtcurve pkgname=gtk-integration-engine-qtcurve
pkgver=1.8.12 pkgver=1.8.12
pkgrel=2 pkgrel=2
@ -15,7 +12,7 @@ pkgdesc='QtCurve-Gtk2 Add-on for Gtk-integration'
url='http://www.kde-look.org/content/show.php?content=40492' url='http://www.kde-look.org/content/show.php?content=40492'
provides=('qtcurve-gtk2') provides=('qtcurve-gtk2')
conflicts=('qtcurve-gtk2') conflicts=('qtcurve-gtk2')
makedepends=('pkgconfig' 'cmake') makedepends=('pkgconfig' 'cmake' 'gtk2')
groups=('gtk-integration') groups=('gtk-integration')
options=('!libtool') options=('!libtool')
categories=('system') categories=('system')

View File

@ -1,46 +1,37 @@
# #
# Chakra Packages for Chakra, part of chakra-project.org # Apps Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer abveritas@chakra-project.org
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=smplayer pkgname=smplayer
pkgver=0.6.9 _pkgname=SMPlayer
pkgrel=5 pkgver=0.8.0
pkgrel=1
pkgdesc="A complete front-end for MPlayer" pkgdesc="A complete front-end for MPlayer"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://smplayer.sourceforge.net/" url="http://smplayer.sourceforge.net/"
license=('GPL') license=('GPL')
depends=('qt>=4.7.2' 'mplayer' 'mpg123') depends=('qt>=4.8.0' 'mplayer>=30526' 'mpg123')
categories=('multimedia') categories=('multimedia')
source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$_pkgname/$pkgver/${pkgname}-${pkgver}.tar.bz2)
seekingfix.diff) md5sums=('8f7d3a9c116e956c68976d0e5dbb83dd')
md5sums=('dfe874b386509de5df78537489f95004'
'9cfd4e15e0c307ebeebec349b07aa6f7')
build() { build() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
# seeking fix for mplayer2 make PREFIX=/usr
patch -Np2 -i ${srcdir}/seekingfix.diff
# remove broken translation
sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro
make PREFIX=/usr || return 1
} }
package(){ package() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
make PREFIX=${pkgdir}/usr install || return 1 make PREFIX=${pkgdir}/usr install
# Icon
install -dm755 ${pkgdir}/usr/share/pixmaps install -dm755 ${pkgdir}/usr/share/pixmaps
ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \ ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
${pkgdir}/usr/share/pixmaps/ ${pkgdir}/usr/share/pixmaps/
# Menu entries.
sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop || return 1 sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop || return 1
sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \ sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \
${pkgdir}/usr/share/applications/smplayer_enqueue.desktop || return 1 ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop
} }

View File

@ -1,22 +0,0 @@
Index: smplayer/trunk/src/mplayerprocess.cpp
===================================================================
--- smplayer/trunk/src/mplayerprocess.cpp (revision 3598)
+++ smplayer/trunk/src/mplayerprocess.cpp (working copy)
@@ -91,6 +91,7 @@
}
static QRegExp rx_av("^[AV]: *([0-9,:.-]+)");
+static QRegExp rx_v("V: *([0-9,:.-]+)");
static QRegExp rx_frame("^[AV]:.* (\\d+)\\/.\\d+");// [0-9,.]+");
static QRegExp rx("^(.*)=(.*)");
#if !NOTIFY_AUDIO_CHANGES
@@ -175,6 +176,9 @@
//qDebug("%s", line.toUtf8().data());
if (rx_av.indexIn(line) > -1) {
double sec = rx_av.cap(1).toDouble();
+ if(rx_v.indexIn(line) > -1) {
+ sec = rx_v.cap(1).toDouble();
+ }
//qDebug("cap(1): '%s'", rx_av.cap(1).toUtf8().data() );
//qDebug("sec: %f", sec);