yngwin      15/07/01 05:39:40

  Modified:             ChangeLog
  Added:                smplayer-14.9.0.6966-r1.ebuild
  Log:
  Unbundle qtsingleapplication (bug #487544). Also fixes compilation with Qt 
5.5 (bug #552376).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x4FDF9CFD2FAC514E!)

Revision  Changes    Path
1.167                media-video/smplayer/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/smplayer/ChangeLog?rev=1.167&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/smplayer/ChangeLog?rev=1.167&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/smplayer/ChangeLog?r1=1.166&r2=1.167

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog   16 Jun 2015 10:45:41 -0000      1.166
+++ ChangeLog   1 Jul 2015 05:39:40 -0000       1.167
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.166 
2015/06/16 10:45:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.167 
2015/07/01 05:39:40 yngwin Exp $
+
+*smplayer-14.9.0.6966-r1 (01 Jul 2015)
+
+  01 Jul 2015; Ben de Groot <yng...@gentoo.org>
+  +files/smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch,
+  +smplayer-14.9.0.6966-r1.ebuild:
+  Unbundle qtsingleapplication (bug #487544). Also fixes compilation with Qt 
5.5
+  (bug #552376).
 
 *smplayer-14.9.0.6966 (16 Jun 2015)
 



1.1                  media-video/smplayer/smplayer-14.9.0.6966-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/smplayer/smplayer-14.9.0.6966-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/smplayer/smplayer-14.9.0.6966-r1.ebuild?rev=1.1&content-type=text/plain

Index: smplayer-14.9.0.6966-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0.6966-r1.ebuild,v 
1.1 2015/07/01 05:39:40 yngwin Exp $

EAPI=5
PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
hu it ja ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL sr sv
th tr uk_UA vi_VN zh_CN zh_TW"
PLOCALE_BACKUP="en_US"
inherit eutils l10n qmake-utils

DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
HOMEPAGE="http://smplayer.info/";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
IUSE="autoshutdown bidi debug +qt4 qt5 streaming"
REQUIRED_USE="^^ ( qt4 qt5 )"

DEPEND="
        qt4? ( dev-qt/qtcore:4
                dev-qt/qtgui:4
                dev-qt/qtsingleapplication[qt4]
                autoshutdown? ( dev-qt/qtdbus:4 )
                streaming? ( dev-qt/qtcore:4[ssl] ) )
        qt5? ( dev-qt/linguist-tools:5
                dev-qt/qtcore:5
                dev-qt/qtgui:5
                dev-qt/qtnetwork:5
                >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
                dev-qt/qtwidgets:5
                dev-qt/qtxml:5
                autoshutdown? ( dev-qt/qtdbus:5 )
                streaming? ( dev-qt/qtnetwork:5[ssl]
                        dev-qt/qtscript:5 ) )"
RDEPEND="${DEPEND}
        || ( media-video/mplayer[bidi?,libass,png,X]
                ( >=media-video/mpv-0.6.2[libass,X]
                        streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )"

src_prepare() {
        epatch "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch # bug 
487544
        use bidi || epatch "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch

        # Upstream Makefile sucks
        sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
                -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
                -e '/\.\/get_svn_revision\.sh/,+2c\
        cd src && $(DEFS) $(MAKE)' \
                "${S}"/Makefile || die "sed failed"

        # Toggle autoshutdown option which pulls in dbus, bug #524392
        if ! use autoshutdown ; then
                sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += 
AUTO_SHUTDOWN_PC:' \
                        -i "${S}"/src/smplayer.pro || die "sed failed"
        fi

        # Turn debug message flooding off
        if ! use debug ; then
                sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
                        "${S}"/src/smplayer.pro || die "sed failed"
        fi

        # Turn off online update checker, bug #479902
        sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
                -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
                -i "${S}"/src/smplayer.pro || die "sed failed"

        # Turn off youtube support (which pulls in extra dependencies) if 
unwanted
        if ! use streaming ; then
                sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += 
YOUTUBE_SUPPORT:' \
                -i "${S}"/src/smplayer.pro || die "sed failed"
        fi

        l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
}

src_configure() {
        cd "${S}"/src
        echo "#define SVN_REVISION \"${PV} (Gentoo)\"" > svn_revision.h
        use qt4 && eqmake4
        use qt5 && eqmake5
}

gen_translation() {
        local mydir
        if use qt4; then
                mydir="$(qt4_get_bindir)"
        elif use qt5; then
                mydir="$(qt5_get_bindir)"
        fi
        ebegin "Generating $1 translation"
        "${mydir}"/lrelease ${PN}_${1}.ts
        eend $? || die "failed to generate $1 translation"
}

src_compile() {
        emake

        cd "${S}"/src/translations
        l10n_for_each_locale_do gen_translation
}

src_install() {
        # remove unneeded copies of licenses
        rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
        rm -r docs/{de,es,fr,nl,ro} || die

        emake DESTDIR="${D}" install
}




Reply via email to