Date: Fri, 12 Apr 2013 12:48:55 GMT From: Shane Ambler <FreeBSD@Shaneware.biz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177806: [Patch] fix broken port audio/hydrogen Message-ID: <201304121248.r3CCmtKj024109@red.freebsd.org> Resent-Message-ID: <201304121250.r3CCo0GR084142@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177806
>Category: ports
>Synopsis: [Patch] fix broken port audio/hydrogen
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 12 12:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Shane Ambler
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD leader.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r246600: Sun Feb 10 16:13:27 CST 2013 shane@leader.local:/usr/obj/usr/src/sys/dtracekern amd64
>Description:
When I went to try out audio/hydrogen today I found that it has been marked as broken for some time and due to be removed so I came up with a fix.
The attached patch is how I got it to compile and install, also I updated it to v0.9.5.1
So far I have compiled using clang on 9.1 but will start testing other setups in the next few days.
I am willing to adopt this port if needed.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru hydrogen.orig/Makefile hydrogen/Makefile
--- hydrogen.orig/Makefile 2013-04-12 21:56:00.064122711 +0930
+++ hydrogen/Makefile 2013-04-12 17:48:48.720962582 +0930
@@ -2,8 +2,8 @@
# $FreeBSD: head/audio/hydrogen/Makefile 311718 2013-02-05 15:07:10Z bapt $
PORTNAME= hydrogen
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.5.1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources
@@ -16,10 +16,6 @@
tar:${PORTSDIR}/devel/libtar \
lrdf:${PORTSDIR}/textproc/liblrdf
-DEPRECATED= Broken for more than 6 month
-EXPIRATION_DATE= 2013-03-05
-BROKEN= does not install
-
MAJORVERSION= 0.9.5
USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
USE_SCONS= yes
@@ -30,7 +26,7 @@
LIBARCHIVE_DESC= LibArchive support
post-patch:
- ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct
+ ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include', '-I${LOCALBASE}/include/raptor2'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct
.include <bsd.port.options.mk>
diff -Nru hydrogen.orig/distinfo hydrogen/distinfo
--- hydrogen.orig/distinfo 2013-04-12 21:56:00.081963523 +0930
+++ hydrogen/distinfo 2013-04-12 14:36:58.587962092 +0930
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.5.tar.gz) = 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3
-SIZE (hydrogen-0.9.5.tar.gz) = 5239702
+SHA256 (hydrogen-0.9.5.1.tar.gz) = ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb
+SIZE (hydrogen-0.9.5.1.tar.gz) = 5515314
diff -Nru hydrogen.orig/files/patch-Sconstruct hydrogen/files/patch-Sconstruct
--- hydrogen.orig/files/patch-Sconstruct 2013-04-12 21:56:00.025963874 +0930
+++ hydrogen/files/patch-Sconstruct 2013-04-12 17:25:41.188963507 +0930
@@ -1,26 +1,49 @@
---- Sconstruct.orig 2011-03-15 18:22:35.000000000 +0600
-+++ Sconstruct 2011-03-22 16:06:25.000000000 +0600
+--- Sconstruct.orig 2012-02-20 08:24:05.000000000 +1030
++++ Sconstruct 2013-04-12 16:49:47.220965697 +0930
@@ -47,7 +47,7 @@
env = Environment( options = opts )
-- if sys.platform == "linux2" or sys.platform == "darwin":
-+ if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform > "freebsd":
+- if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin":
++ if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin" or sys.platform > "freebsd":
if str(env['debug']) == "1":
cppflags += ['-Wall', '-g2', '-ggdb', '-O0']
for flag in env["optflags"].split(" "):
-@@ -91,11 +91,12 @@
+@@ -91,11 +91,13 @@
includes.append( '/opt/local/include' )
includes.append( '/usr/local/include/jack' )
-- elif sys.platform == 'linux2':
+- elif sys.platform == 'linux2' or sys.platform == 'linux3':
+ elif str(env['alsa']) == "1" and sys.platform > 'freebsd' :
ldflags.append('-lpthread')
ldflags.append('-lasound')
# ldflags.append('-lrubberband')
--
+
+ elif sys.platform > 'freebsd' :
+ print "Alsa disabled; nothing to do"
elif sys.platform == "win32":
includes.append( '3rdparty\libsndfile-1_0_17' )
includes.append( 'build\pthreads\include' )
+@@ -299,7 +301,7 @@
+
+ for N in glob.glob('./data/i18n/hydrogen.*'):
+ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
++ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen', source="./data"))
+
+ #add every img in ./data/img to the install list.
+ os.path.walk("./data/img/",install_images,env)
+@@ -450,9 +452,9 @@
+ Exit(1)
+
+ #lrdf: categorizing of ladspa effects
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
+- print 'lrdf must be installed!'
+- Exit(1)
++#if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
++# print 'lrdf must be installed!'
++# Exit(1)
+
+
+ print ""
+
diff -Nru hydrogen.orig/pkg-plist hydrogen/pkg-plist
--- hydrogen.orig/pkg-plist 2013-04-12 21:56:00.087482228 +0930
+++ hydrogen/pkg-plist 2013-04-12 17:36:17.306962895 +0930
@@ -211,6 +211,9 @@
%%DATADIR%%/data/doc/tutorial.docbook
%%DATADIR%%/data/doc/tutorial.pot
%%DATADIR%%/data/doc/tutorial_en.html
+%%DATADIR%%/data/doc/tutorial_es.docbook
+%%DATADIR%%/data/doc/tutorial_es.html
+%%DATADIR%%/data/doc/tutorial_es.po
%%DATADIR%%/data/doc/tutorial_fr.html
%%DATADIR%%/data/doc/tutorial_fr.po
%%DATADIR%%/data/doc/tutorial_it.html
@@ -258,6 +261,8 @@
%%DATADIR%%/data/i18n/hydrogen.cs.ts
%%DATADIR%%/data/i18n/hydrogen.de.qm
%%DATADIR%%/data/i18n/hydrogen.de.ts
+%%DATADIR%%/data/i18n/hydrogen.el.qm
+%%DATADIR%%/data/i18n/hydrogen.el.ts
%%DATADIR%%/data/i18n/hydrogen.es.qm
%%DATADIR%%/data/i18n/hydrogen.es.ts
%%DATADIR%%/data/i18n/hydrogen.fr.qm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304121248.r3CCmtKj024109>