[arch-commits] Commit in smplayer/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Thu May 5 15:20:53 UTC 2016
Date: Thursday, May 5, 2016 @ 17:20:53
Author: arojas
Revision: 266953
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
smplayer/repos/extra-i686/PKGBUILD
(from rev 266952, smplayer/trunk/PKGBUILD)
smplayer/repos/extra-i686/smplayer-dock-playlist-qt5.patch
(from rev 266952, smplayer/trunk/smplayer-dock-playlist-qt5.patch)
smplayer/repos/extra-x86_64/PKGBUILD
(from rev 266952, smplayer/trunk/PKGBUILD)
smplayer/repos/extra-x86_64/smplayer-dock-playlist-qt5.patch
(from rev 266952, smplayer/trunk/smplayer-dock-playlist-qt5.patch)
Deleted:
smplayer/repos/extra-i686/PKGBUILD
smplayer/repos/extra-x86_64/PKGBUILD
-----------------------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++
extra-i686/PKGBUILD | 34 ---------
extra-i686/smplayer-dock-playlist-qt5.patch | 25 +++++++
extra-x86_64/PKGBUILD | 34 ---------
extra-x86_64/smplayer-dock-playlist-qt5.patch | 25 +++++++
5 files changed, 134 insertions(+), 68 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-05 15:20:22 UTC (rev 266952)
+++ extra-i686/PKGBUILD 2016-05-05 15:20:53 UTC (rev 266953)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-# Contributor: shamrok <szamrok at gmail.com>
-
-pkgname=smplayer
-pkgver=16.4.0
-pkgrel=2
-pkgdesc="A complete front-end for MPlayer"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net/"
-license=('GPL')
-depends=('qt5-script' 'mplayer' 'hicolor-icon-theme')
-makedepends=('qt5-tools')
-optdepends=('smplayer-themes: icon themes collection'
- 'smplayer-skins: skin themes collection'
- 'smtube: browse and play youtube videos'
- 'mpv: for using mpv instead of mplayer')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('b89975a1edc60e1ea89159e4bd7cde07')
-
-build() {
- cd "$pkgname-$pkgver"
- make PREFIX=/usr \
- DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
- QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DOC_PATH=/usr/share/doc/smplayer \
- DESTDIR="$pkgdir" PREFIX="/usr" install
-}
Copied: smplayer/repos/extra-i686/PKGBUILD (from rev 266952, smplayer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-05 15:20:53 UTC (rev 266953)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer:
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+# Contributor: shamrok <szamrok at gmail.com>
+
+pkgname=smplayer
+pkgver=16.4.0
+pkgrel=3
+pkgdesc="A complete front-end for MPlayer"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net/"
+license=('GPL')
+depends=('qt5-script' 'mplayer' 'hicolor-icon-theme')
+makedepends=('qt5-tools')
+optdepends=('smplayer-themes: icon themes collection'
+ 'smplayer-skins: skin themes collection'
+ 'smtube: browse and play youtube videos'
+ 'mpv: for using mpv instead of mplayer')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 smplayer-dock-playlist-qt5.patch)
+md5sums=('b89975a1edc60e1ea89159e4bd7cde07'
+ 'e0cfdf29daf815404501a11e7ebac2eb')
+
+prepare() {
+ cd $pkgname-$pkgver
+# Fix crash in kwin
+ patch -p0 -i ../smplayer-dock-playlist-qt5.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make PREFIX=/usr \
+ DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
+ QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DOC_PATH=/usr/share/doc/smplayer \
+ DESTDIR="$pkgdir" PREFIX="/usr" install
+}
Copied: smplayer/repos/extra-i686/smplayer-dock-playlist-qt5.patch (from rev 266952, smplayer/trunk/smplayer-dock-playlist-qt5.patch)
===================================================================
--- extra-i686/smplayer-dock-playlist-qt5.patch (rev 0)
+++ extra-i686/smplayer-dock-playlist-qt5.patch 2016-05-05 15:20:53 UTC (rev 266953)
@@ -0,0 +1,25 @@
+--- src/guiconfig.h.orig 2016-05-05 17:05:45.131333069 +0200
++++ src/guiconfig.h 2016-05-05 17:05:17.883829511 +0200
+@@ -19,12 +19,21 @@
+ #ifndef GUICONFIG_H
+ #define GUICONFIG_H
+
++#include <QtGlobal>
+
+ // DOCK_PLAYLIST
+ // if 1, the playlist will be docked in the main window, instead
+ // of being a top level window
+-
++#ifdef Q_OS_WIN
+ #define DOCK_PLAYLIST 1
++#else
++ #if QT_VERSION >= 0x050000
++ // There's problems with the playlist with Qt5 when using compiz
++ #define DOCK_PLAYLIST 0
++ #else
++ #define DOCK_PLAYLIST 1
++ #endif
++#endif
+
+
+ // AUTODISABLE_ACTIONS
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-05 15:20:22 UTC (rev 266952)
+++ extra-x86_64/PKGBUILD 2016-05-05 15:20:53 UTC (rev 266953)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-# Contributor: shamrok <szamrok at gmail.com>
-
-pkgname=smplayer
-pkgver=16.4.0
-pkgrel=2
-pkgdesc="A complete front-end for MPlayer"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net/"
-license=('GPL')
-depends=('qt5-script' 'mplayer' 'hicolor-icon-theme')
-makedepends=('qt5-tools')
-optdepends=('smplayer-themes: icon themes collection'
- 'smplayer-skins: skin themes collection'
- 'smtube: browse and play youtube videos'
- 'mpv: for using mpv instead of mplayer')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('b89975a1edc60e1ea89159e4bd7cde07')
-
-build() {
- cd "$pkgname-$pkgver"
- make PREFIX=/usr \
- DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
- QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DOC_PATH=/usr/share/doc/smplayer \
- DESTDIR="$pkgdir" PREFIX="/usr" install
-}
Copied: smplayer/repos/extra-x86_64/PKGBUILD (from rev 266952, smplayer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-05 15:20:53 UTC (rev 266953)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer:
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+# Contributor: shamrok <szamrok at gmail.com>
+
+pkgname=smplayer
+pkgver=16.4.0
+pkgrel=3
+pkgdesc="A complete front-end for MPlayer"
+arch=('i686' 'x86_64')
+url="http://smplayer.sourceforge.net/"
+license=('GPL')
+depends=('qt5-script' 'mplayer' 'hicolor-icon-theme')
+makedepends=('qt5-tools')
+optdepends=('smplayer-themes: icon themes collection'
+ 'smplayer-skins: skin themes collection'
+ 'smtube: browse and play youtube videos'
+ 'mpv: for using mpv instead of mplayer')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 smplayer-dock-playlist-qt5.patch)
+md5sums=('b89975a1edc60e1ea89159e4bd7cde07'
+ 'e0cfdf29daf815404501a11e7ebac2eb')
+
+prepare() {
+ cd $pkgname-$pkgver
+# Fix crash in kwin
+ patch -p0 -i ../smplayer-dock-playlist-qt5.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make PREFIX=/usr \
+ DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
+ QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DOC_PATH=/usr/share/doc/smplayer \
+ DESTDIR="$pkgdir" PREFIX="/usr" install
+}
Copied: smplayer/repos/extra-x86_64/smplayer-dock-playlist-qt5.patch (from rev 266952, smplayer/trunk/smplayer-dock-playlist-qt5.patch)
===================================================================
--- extra-x86_64/smplayer-dock-playlist-qt5.patch (rev 0)
+++ extra-x86_64/smplayer-dock-playlist-qt5.patch 2016-05-05 15:20:53 UTC (rev 266953)
@@ -0,0 +1,25 @@
+--- src/guiconfig.h.orig 2016-05-05 17:05:45.131333069 +0200
++++ src/guiconfig.h 2016-05-05 17:05:17.883829511 +0200
+@@ -19,12 +19,21 @@
+ #ifndef GUICONFIG_H
+ #define GUICONFIG_H
+
++#include <QtGlobal>
+
+ // DOCK_PLAYLIST
+ // if 1, the playlist will be docked in the main window, instead
+ // of being a top level window
+-
++#ifdef Q_OS_WIN
+ #define DOCK_PLAYLIST 1
++#else
++ #if QT_VERSION >= 0x050000
++ // There's problems with the playlist with Qt5 when using compiz
++ #define DOCK_PLAYLIST 0
++ #else
++ #define DOCK_PLAYLIST 1
++ #endif
++#endif
+
+
+ // AUTODISABLE_ACTIONS
More information about the arch-commits
mailing list