cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update xmms2 to 0.7

Browse Source 
from maintainer
This commit is contained in:
jasper 2010-04-24 17:37:54 +00:00
parent 2a66e98a65
commit db2c357793
9 changed files with 68 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/xmms2/Makefile
View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.5 2009/07/19 22:49:12 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2010/04/24 17:37:54 jasper Exp $
COMMENT = audio player daemon with library management
V = 0.6
DISTNAME = xmms2-${V}DrMattDestruction
PKGNAME = xmms2-${V}p3
V = 0.7
DISTNAME = xmms2-${V}DrNo
PKGNAME = xmms2-${V}
SHARED_LIBS += xmmsclient++ 0.0 # 3.0.0
SHARED_LIBS += xmmsclient++ 1.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 0.0 # 1.0.0
SHARED_LIBS += xmmsclient-glib 0.0 # 1.0.0
SHARED_LIBS += xmmsclient 0.0 # 5.0.0
SHARED_LIBS += xmmsclient 1.0 # 6.0.0
CATEGORIES = audio
HOMEPAGE = http://wiki.xmms2.xmms.se
HOMEPAGE = http://wiki.xmms2.xmms.se/
MAINTAINER= Amaury Gauthier <amaury.gauthier@etu.unilim.fr>
@ -50,7 +50,8 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
FLAC.>=9::audio/flac \
curl.>=13::net/curl \
mad.>=2::audio/libmad \
avahi-client,avahi-common,avahi-glib::net/avahi
avahi-client,avahi-common,avahi-glib::net/avahi \
vorbisidec.>=2::audio/tremor
WSCRIPT_PATCHES = src/clients/lib/xmmsclient++/wscript \
src/clients/lib/xmmsclient++-glib/wscript \
@ -64,13 +65,12 @@ pre-configure:
# Disable shared memory support for visualization because it requires semtimedop()
do-configure:
cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure --prefix=${PREFIX} \
--with-mandir=${PREFIX}/man \
--mandir=${PREFIX}/man \
--conf-prefix=${PREFIX} \
--without-plugins=speex,sun \
--with-default-output-plugin=ao \
--disable-shmvis-server \
--without-optionals=dns_sd,medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
--without-plugins=airplay,alsa,cdda,coreaudio,faad,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,vocoder,waveout,wavpack
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,vocoder,waveout,wavpack
do-build:
cd ${WRKSRC} && ${MODPY_BIN} ./waf build

10
audio/xmms2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = lU+5x2tdteMkoQXoGycyAA==
RMD160 (xmms2-0.6DrMattDestruction.tar.bz2) = yNmyoZq3gi924S/Cx4ZAxajm5pg=
SHA1 (xmms2-0.6DrMattDestruction.tar.bz2) = Uktk0vjbHX2ERJVmpG9rVq1M6rs=
SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = T7T0aYFtihpnb2Zg43CwxzoH49flnQf1ekO2chYpHbg=
SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304
MD5 (xmms2-0.7DrNo.tar.bz2) = YOULWRB4rLaoXNg94PKwdw==
RMD160 (xmms2-0.7DrNo.tar.bz2) = OlJt+foe1RA7aiUsNMA5S/Dk8VY=
SHA1 (xmms2-0.7DrNo.tar.bz2) = SZlWhlSg0quoS9pLIhRQWLvT/LI=
SHA256 (xmms2-0.7DrNo.tar.bz2) = WcWNk4DmsAKSCo3HXw/UYpqxdbgvKbZjf3gW/cmDKyw=
SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973

16
audio/xmms2/patches/patch-src_clients_lib_perl_wscript
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_clients_lib_perl_wscript,v 1.1 2009/06/08 17:08:48 ajacoutot Exp $
--- src/clients/lib/perl/wscript.orig Thu Jun 4 12:11:24 2009
+++ src/clients/lib/perl/wscript Thu Jun 4 12:12:19 2009
@@ -17,9 +17,9 @@ def build(bld):
obj.mac_bundle = True
bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient.pm')
- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Sync.pm')
- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Glib.pm')
- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Collection.pm')
+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Sync.pm')
+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Glib.pm')
+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Collection.pm')
def configure(conf):
conf.check_tool('perl')

12
audio/xmms2/patches/patch-src_clients_lib_xmmsclient++_wscript
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_clients_lib_xmmsclient++_wscript,v 1.1 2009/07/12 20:25:00 ajacoutot Exp $
--- src/clients/lib/xmmsclient++/wscript.orig Tue Jun 16 20:43:39 2009
+++ src/clients/lib/xmmsclient++/wscript Tue Jun 16 20:43:58 2009
$OpenBSD: patch-src_clients_lib_xmmsclient++_wscript,v 1.2 2010/04/24 17:37:54 jasper Exp $
--- src/clients/lib/xmmsclient++/wscript.orig Fri Feb 19 18:43:54 2010
+++ src/clients/lib/xmmsclient++/wscript Sat Apr 24 19:31:49 2010
@@ -26,7 +26,7 @@ def build(bld):
""".split()
obj.uselib_local = 'xmmsclient'
obj.uselib = 'BOOST BOOST_SIGNALS socket'
- obj.vnum = '3.0.0'
obj.uselib = 'BOOST socket'
- obj.vnum = '4.0.0'
+ obj.vnum = '${LIBxmmsclient++_VERSION}'
tool.add_install_flag(bld, obj)
def configure(conf):

8
audio/xmms2/patches/patch-src_clients_lib_xmmsclient_wscript
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_clients_lib_xmmsclient_wscript,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
--- src/clients/lib/xmmsclient/wscript.orig Sat May 16 17:20:23 2009
+++ src/clients/lib/xmmsclient/wscript Sat May 16 17:36:07 2009
$OpenBSD: patch-src_clients_lib_xmmsclient_wscript,v 1.2 2010/04/24 17:37:54 jasper Exp $
--- src/clients/lib/xmmsclient/wscript.orig Sat Mar 13 19:27:38 2010
+++ src/clients/lib/xmmsclient/wscript Sat Mar 13 19:28:13 2010
@@ -31,7 +31,7 @@ def build(bld):
else:
obj.source += ["visualization/dummy.c"]
- obj.vnum = "5.0.0"
- obj.vnum = "6.0.0"
+ obj.vnum = "${LIBxmmsclient_VERSION}"
tool.add_install_flag(bld, obj)

48
audio/xmms2/patches/patch-wafadmin_Tools_ccroot_py
View File

@ -1,27 +1,33 @@
$OpenBSD: patch-wafadmin_Tools_ccroot_py,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
$OpenBSD: patch-wafadmin_Tools_ccroot_py,v 1.2 2010/04/24 17:37:54 jasper Exp $
Don't create symlink for shared librairies versions.
Don't put (wrong) SONAME in shared libraries.
Use good version numbers for libs.
--- wafadmin/Tools/ccroot.py.orig Tue Apr 21 19:50:47 2009
+++ wafadmin/Tools/ccroot.py Tue May 26 23:24:47 2009
@@ -113,8 +113,8 @@ def install_shlib(self):
filename = self.outputs[0].abspath(self.env)
bld = Build.bld
bld.install_as(os.path.join(path, name3), filename, env=self.env)
- bld.symlink_as(os.path.join(path, name2), name3)
- bld.symlink_as(os.path.join(path, name1), name3)
+ #bld.symlink_as(os.path.join(path, name2), name3)
+ #bld.symlink_as(os.path.join(path, name1), name3)
--- wafadmin/Tools/ccroot.py.orig Sun Mar 14 17:57:48 2010
+++ wafadmin/Tools/ccroot.py Sun Mar 14 17:59:04 2010
@@ -580,7 +580,7 @@ def apply_vnum(self):
name2 = libname + '.' + nums[0]
# TODO reference the d programs, shlibs in d.py, not here
if self.env.SONAME_ST:
- v = self.env.SONAME_ST % name2
+ v = self.env.SONAME_ST % name3
self.env.append_value('LINKFLAGS', v.split())
@@ -384,7 +384,7 @@ def apply_vnum(self):
try: name3 = self.soname
except AttributeError: name3 = self.link_task.outputs[0].name + '.' + nums[0]
self.link_task.outputs.append(self.link_task.outputs[0].parent.find_or_declare(name3))
- self.env.append_value('LINKFLAGS', '-Wl,-h,'+name3)
+ self.env.append_value('LINKFLAGS', '-Wl')
bld = self.bld
@@ -590,13 +590,13 @@ def apply_vnum(self):
if not path: return
@taskgen
@after('apply_link')
bld.install_as(path + os.sep + name3, node, env=self.env)
- bld.symlink_as(path + os.sep + name2, name3)
- bld.symlink_as(path + os.sep + libname, name3)
+ #bld.symlink_as(path + os.sep + name2, name3)
+ #bld.symlink_as(path + os.sep + libname, name3)
# the following task is just to enable execution from the build dir :-/
tsk = self.create_task('vnum')
tsk.set_inputs([node])
- tsk.set_outputs(node.parent.find_or_declare(name2))
+ tsk.set_outputs(node.parent.find_or_declare(name3))
def exec_vnum_link(self):
path = self.outputs[0].abspath(self.env)

12
audio/xmms2/patches/patch-wafadmin_Tools_python_py
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-wafadmin_Tools_python_py,v 1.1 2009/07/12 20:25:00 ajacoutot Exp $
$OpenBSD: patch-wafadmin_Tools_python_py,v 1.2 2010/04/24 17:37:54 jasper Exp $
We remove the flag "-pthread" because waf is complety incapable to
treat it correctly when it is in LIB_PYEMBED variable (it adds '-l').
--- wafadmin/Tools/python.py.orig Tue Apr 21 19:51:11 2009
+++ wafadmin/Tools/python.py Sun Jun 7 20:46:40 2009
@@ -219,6 +219,9 @@ int main(int argc, char *argv[]) { Py_Initialize(); Py
--- wafadmin/Tools/python.py.orig Fri Feb 19 18:43:54 2010
+++ wafadmin/Tools/python.py Sat Apr 24 19:31:49 2010
@@ -215,6 +215,9 @@ MACOSX_DEPLOYMENT_TARGET = %r
result = False
name = 'python' + env['PYTHON_VERSION']
+ env['LIB_PYEMBED'].remove('-pthread')
+ env['LINKFLAGS_PYEMBED'].append('-pthread')
+
if python_LIBDIR is not None:
path = [python_LIBDIR]
result = conf.check(lib=name, uselib='PYEMBED', libpath=path)
conf.log.write("\n\n# Trying LIBDIR: %r\n" % path)

14
audio/xmms2/patches/patch-wscript
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wscript,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
--- wscript.orig Tue Apr 21 17:51:11 2009
+++ wscript Tue May 26 17:13:06 2009
@@ -309,6 +309,7 @@ def configure(conf):
$OpenBSD: patch-wscript,v 1.2 2010/04/24 17:37:54 jasper Exp $
--- wscript.orig Fri Feb 19 18:43:54 2010
+++ wscript Sat Apr 24 19:31:49 2010
@@ -315,6 +315,7 @@ def configure(conf):
# Our static libraries may link to dynamic libraries
if Options.platform != 'win32':
conf.env["staticlib_CCFLAGS"] += ['-fPIC', '-DPIC']
@ -9,8 +9,8 @@ $OpenBSD: patch-wscript,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
else:
# As we have to change target platform after the tools
# have been loaded there are a few variables that needs
@@ -479,9 +480,10 @@ def shutdown():
if Options.commands['install'] and os.geteuid() == 0:
@@ -486,9 +487,10 @@ def shutdown():
):
ldconfig = '/sbin/ldconfig'
if os.path.isfile(ldconfig):
- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
@ -22,4 +22,4 @@ $OpenBSD: patch-wscript,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
+ pass
if Options.options.run_tests:
os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes"))
os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))

5
audio/xmms2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2009/07/12 20:25:00 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/04/24 17:37:54 jasper Exp $
@bin bin/nyxmms2
@bin bin/vistest
@bin bin/vistest-fft
@ -22,7 +22,6 @@ include/xmms2/xmms/xmms_outputplugin.h
include/xmms2/xmms/xmms_plugin.h
include/xmms2/xmms/xmms_sample.h
include/xmms2/xmms/xmms_streamtype.h
include/xmms2/xmms/xmms_strfunc.h
include/xmms2/xmms/xmms_util.h
include/xmms2/xmms/xmms_xformplugin.h
include/xmms2/xmmsc/
@ -101,7 +100,6 @@ lib/xmms2/libxmms_equalizer.so
lib/xmms2/libxmms_file.so
lib/xmms2/libxmms_flac.so
lib/xmms2/libxmms_flv.so
lib/xmms2/libxmms_gme.so
lib/xmms2/libxmms_gvfs.so
lib/xmms2/libxmms_html.so
lib/xmms2/libxmms_icymetaint.so
@ -117,6 +115,7 @@ lib/xmms2/libxmms_nulstripper.so
lib/xmms2/libxmms_pls.so
lib/xmms2/libxmms_replaygain.so
lib/xmms2/libxmms_rss.so
lib/xmms2/libxmms_tremor.so
lib/xmms2/libxmms_tta.so
lib/xmms2/libxmms_vorbis.so
lib/xmms2/libxmms_wave.so