From owner-svn-ports-all@FreeBSD.ORG Tue May 13 22:07:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1C463F4; Tue, 13 May 2014 22:07:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC13123DB; Tue, 13 May 2014 22:07:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DM7NU6023249; Tue, 13 May 2014 22:07:23 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DM7Mnw023244; Tue, 13 May 2014 22:07:22 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201405132207.s4DM7Mnw023244@svn.freebsd.org> From: Thomas Zander Date: Tue, 13 May 2014 22:07:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354005 - in branches/2014Q2/multimedia/quodlibet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 22:07:24 -0000 Author: riggs Date: Tue May 13 22:07:22 2014 New Revision: 354005 URL: http://svnweb.freebsd.org/changeset/ports/354005 QAT: https://qat.redports.org/buildarchive/r354005/ Log: MFH: r353703 Un-break install, but while on it - Update port to upstream release 2.6.3 - Use correct download URL (move from Google code to bitbucket) - Add LICENSE - USE_* -> USES - Generate plist via pydistutils - Use SPC option on i386 only, it's not supported elsewhere - Stagify - Change URLs in pkg-message (pointing to bitbucket), simplify Special thanks to Carlos (submitter) for reviewing, and to Christoph Reiter (Quodlibet project) for fixing the '--record' option for Quodlibet with pydistutils. PR: ports/187263 Submitted by: Carlos Jacobo Puga Medina Reviewed by: submitter Approved by: portmgr(antoine), thierry (mentor), maintainer timeout Added: branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils - copied unchanged from r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils branches/2014Q2/multimedia/quodlibet/files/patch-operon.py - copied unchanged from r353703, head/multimedia/quodlibet/files/patch-operon.py Deleted: branches/2014Q2/multimedia/quodlibet/files/patch-quodlibet__qltk__config.py branches/2014Q2/multimedia/quodlibet/pkg-plist Modified: branches/2014Q2/multimedia/quodlibet/Makefile branches/2014Q2/multimedia/quodlibet/distinfo branches/2014Q2/multimedia/quodlibet/pkg-message Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/quodlibet/Makefile ============================================================================== --- branches/2014Q2/multimedia/quodlibet/Makefile Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/Makefile Tue May 13 22:07:22 2014 (r354005) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= quodlibet -PORTVERSION= 2.2 -PORTREVISION= 7 +PORTVERSION= 2.6.3 CATEGORIES= multimedia audio python gnome -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/ MAINTAINER= johnson.peter@gmail.com COMMENT= A GTK+-based audio player written in Python @@ -15,24 +14,25 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutage USE_PYTHON= yes USE_GNOME= pygtk2 -USES= gettext +USES= display gettext USE_PYDISTUTILS= yes -USE_DISPLAY= yes -USE_GSTREAMER= gconf good python +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_AUTOPLIST= yes + +EXTRA_PATCHES= ${FILESDIR}/extra-patch-pydistutils -MAN1= exfalso.1 quodlibet.1 +USE_GSTREAMER= gconf good python OPTIONS_DEFINE= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE EXTENSIONS -SPC_DESC= SPC (SNES ROM audio) support + +OPTIONS_DEFAULT= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE + +SPC_DESC= SPC (SNES ROM audio) support on i386 SPEEX_DESC= OGG/Speex audio support REMOTE_DESC= Enable remote playback EXTENSIONS_DESC= Enable extensions -OPTIONS_DEFAULT= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE - -NO_STAGE= yes .include -.include .if ${PORT_OPTIONS:MOGG} USE_GSTREAMER+= ogg @@ -42,7 +42,7 @@ USE_GSTREAMER+= ogg USE_GSTREAMER+= vorbis .endif -.if ${PORT_OPTIONS:MSPC} +.if ${PORT_OPTIONS:MSPC} && ${ARCH} == i386 USE_GSTREAMER+= spc .endif @@ -59,17 +59,17 @@ USE_GSTREAMER+= flac .endif .if ${PORT_OPTIONS:MMUSEPACK} -LIB_DEPENDS+= mpcdec.7:${PORTSDIR}/audio/musepack +LIB_DEPENDS+= libmpcdec.so:${PORTSDIR}/audio/musepack USE_GSTREAMER+= musepack .endif .if ${PORT_OPTIONS:MWAVPACK} -LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack +LIB_DEPENDS+= libwavpack.so:${PORTSDIR}/audio/wavpack USE_GSTREAMER+= wavpack .endif .if ${PORT_OPTIONS:MAAC} -LIB_DEPENDS+= mp4v2.10:${PORTSDIR}/multimedia/mp4v2 +LIB_DEPENDS+= libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 USE_GSTREAMER+= faad .endif @@ -86,14 +86,6 @@ USE_GSTREAMER+= gnomevfs .if ${PORT_OPTIONS:MEXTENSIONS} USE_GNOME+= pygnomeextras -PLIST_SUB+= EXTENSIONS="" -.else -PLIST_SUB+= EXTENSIONS="@comment " .endif -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -.include +.include Modified: branches/2014Q2/multimedia/quodlibet/distinfo ============================================================================== --- branches/2014Q2/multimedia/quodlibet/distinfo Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/distinfo Tue May 13 22:07:22 2014 (r354005) @@ -1,2 +1,2 @@ -SHA256 (quodlibet-2.2.tar.gz) = 1aac91369b26fa897c0d9eaa6a43aadcd5ffe8751a298a6c7beabe7591c0e713 -SIZE (quodlibet-2.2.tar.gz) = 910381 +SHA256 (quodlibet-2.6.3.tar.gz) = dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 +SIZE (quodlibet-2.6.3.tar.gz) = 2507416 Copied: branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils (from r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils Tue May 13 22:07:22 2014 (r354005, copy of r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils) @@ -0,0 +1,145 @@ +--- gdist/icons.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/icons.py 2014-04-23 11:06:22.328926759 +0200 +@@ -35,13 +35,16 @@ + prefix = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('install', + ('root', 'root'), + ('install_base', 'prefix')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + # install into hicolor icon theme + basepath = os.path.join(self.prefix, 'share', 'icons', 'hicolor') +@@ -52,11 +55,13 @@ + + scalable = os.path.join(local, "scalable", "apps") + scalable_dst = os.path.join(basepath, "scalable", "apps") +- self.copy_tree(scalable, scalable_dst) ++ out = self.copy_tree(scalable, scalable_dst) ++ self.outfiles.extend(out) + + png = os.path.join(local, "64x64", "apps") + png_dst = os.path.join(basepath, "64x64", "apps") +- self.copy_tree(png, png_dst) ++ out = self.copy_tree(png, png_dst) ++ self.outfiles.extend(out) + + # this fails during packaging.. so ignore the outcome + subprocess.call(['gtk-update-icon-cache', basepath]) +@@ -66,4 +71,5 @@ + if self.root is not None: + basepath = change_root(self.root, basepath) + +- self.copy_tree(png, basepath) ++ out = self.copy_tree(png, basepath) ++ self.outfiles.extend(out) +--- gdist/man.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/man.py 2014-04-23 11:10:03.793912457 +0200 +@@ -29,7 +29,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('install', ('root', 'root'), ('install_base', 'prefix')) +@@ -38,15 +38,22 @@ + if not man_page[-1].isdigit(): + raise SystemExit("%r has no section" % man_page) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + basepath = os.path.join(self.prefix, 'share', 'man') + if self.root != None: + basepath = change_root(self.root, basepath) +- self.mkpath(basepath) ++ out = self.mkpath(basepath) ++ self.outfiles.extend(out or []) + for man_page in self.man_pages: + manpath = os.path.join(basepath, "man" + man_page[-1]) + self.mkpath(manpath) ++ out = self.mkpath(manpath) ++ self.outfiles.extend(out or []) + fullpath = os.path.join(manpath, os.path.basename(man_page)) +- self.copy_file(man_page, fullpath) ++ (out, _) = self.copy_file(man_page, fullpath) ++ self.outfiles.append(out) + + __all__ = ["install_man"] +--- gdist/po.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/po.py 2014-04-23 11:06:22.329926420 +0200 +@@ -149,7 +149,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('build', ('build_base', 'build_base')) +@@ -159,6 +159,9 @@ + ('install_base', 'install_base'), + ('skip_build', 'skip_build')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + if not self.skip_build: + self.run_command('build_mo') +@@ -166,6 +169,7 @@ + dest = os.path.join(self.install_base, "share", "locale") + if self.root != None: + dest = change_root(self.root, dest) +- self.copy_tree(src, dest) ++ out = self.copy_tree(src, dest) ++ self.outfiles.extend(out) + + __all__ = ["build_mo", "install_mo", "po_stats", "check_pot"] +--- gdist/shortcuts.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/shortcuts.py 2014-04-23 11:11:31.218905210 +0200 +@@ -66,7 +66,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('build', ('build_base', 'build_base')) +@@ -79,6 +79,9 @@ + self.set_undefined_options( + 'build_shortcuts', ('shortcuts', 'shortcuts')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + if not self.skip_build: + self.run_command('build_shortcuts') +@@ -86,10 +89,13 @@ + if self.root != None: + basepath = change_root(self.root, basepath) + srcpath = os.path.join(self.build_base, 'share', 'applications') +- self.mkpath(basepath) ++ out = self.mkpath(basepath) ++ self.outfiles.extend(out or []) + for shortcut in self.shortcuts: + fullsrc = os.path.join(srcpath, shortcut) + fullpath = os.path.join(basepath, shortcut) + self.copy_file(fullsrc, fullpath) ++ (out, _) = self.copy_file(fullsrc, fullpath) ++ self.outfiles.append(out) + + __all__ = ["build_shortcuts", "install_shortcuts"] Copied: branches/2014Q2/multimedia/quodlibet/files/patch-operon.py (from r353703, head/multimedia/quodlibet/files/patch-operon.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/quodlibet/files/patch-operon.py Tue May 13 22:07:22 2014 (r354005, copy of r353703, head/multimedia/quodlibet/files/patch-operon.py) @@ -0,0 +1,8 @@ +--- operon.py.orig 2013-09-13 00:49:22.000000000 +0200 ++++ operon.py 2014-04-23 12:21:26.430626881 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # Copyright 2012,2013 Christoph Reiter + # + # This program is free software; you can redistribute it and/or modify Modified: branches/2014Q2/multimedia/quodlibet/pkg-message ============================================================================== --- branches/2014Q2/multimedia/quodlibet/pkg-message Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/pkg-message Tue May 13 22:07:22 2014 (r354005) @@ -1,13 +1,11 @@ +===================================================================== For additional Quod Libet plugins: -1. Fetch plugins archive. +1. Fetch plugins archive from project download page: + https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-2.6.3.tar.gz - fetch http://quodlibet.googlecode.com/files/quodlibet-plugins-2.2.tar.gz - -2. Extract archive. - - tar xvfz quodlibet-plugins-2.2.tar.gz - -3. Copy extracted files to Quod Libet plugins directory. - - cp -R quodlibet-plugins-2.2/* ~/.quodlibet/plugins/ +2. Extract archive into plugin dir in a user's home directory + mkdir -p ~/.quodlibet/plugins/ + cd ~/.quodlibet/plugins/ + tar xf path/to/downloaded/quodlibet-plugins-2.6.3.tar.gz +=====================================================================