Date: Tue, 16 Oct 2012 21:55:45 GMT From: Frédéric Praca <frederic.praca@free.fr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172800: [PATCH] fix build/install for audio/hydrogen Message-ID: <201210162155.q9GLtjZ3086583@red.freebsd.org> Resent-Message-ID: <201210162200.q9GM01Xx005260@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172800
>Category: ports
>Synopsis: [PATCH] fix build/install for 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: Tue Oct 16 22:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Frédéric Praca
>Release: FreeBSD 8.3-STABLE
>Organization:
>Environment:
FreeBSD coruscant.dnsalias.net 8.3-STABLE FreeBSD 8.3-STABLE #10: Sat Sep 29 16:55:55 CEST 2012 root@coruscant.dnsalias.net:/usr/obj/usr/src/sys/CORUSCANT i386
>Description:
The attached shar file fixes the build/install problem for audio/hydrogen.
>How-To-Repeat:
>Fix:
Just overwrite Makefile and patch-Sconstruct with shar file content
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# .
# ./Makefile
# ./files
# ./files/patch-Sconstruct
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo x - ./Makefile
sed 's/^X//' >./Makefile << '464ef7c6571951809b23e262cbe26e19'
X# New ports collection makefile for: Hydrogen
X# Date created: 23 Jun 2004
X# Whom: Jean-Yves Lefort <jylefort@brutele.be>
X#
X# $FreeBSD: ports/audio/hydrogen/Makefile,v 1.28 2012/06/06 06:43:15 miwi Exp $
X#
X
XPORTNAME= hydrogen
XPORTVERSION= 0.9.5
XCATEGORIES= audio
XMASTER_SITES= SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources
X
XMAINTAINER= devel@stasyan.com
XCOMMENT= An advanced drum machine
X
XLIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \
X tar.0:${PORTSDIR}/devel/libtar \
X lrdf.2:${PORTSDIR}/textproc/liblrdf
X
XLICENSE= GPLv2
XLICENSE_FILE= ${WRKSRC}/COPYING
X
XMAJORVERSION= 0.9.5
XUSE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
XUSE_SCONS= yes
X
XOPTIONS= JACK "JACK support" on \
X ALSA "ALSA support" off \
X PORTAUDIO "PortAudio support" off \
X LIBARCHIVE "LibArchive support" off \
X LASH "Lash support" off
X
Xpost-patch:
X ${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
X
X.include <bsd.port.options.mk>
X
XSCONS_ENV+= oss=1
X.if defined(WITH_JACK)
XLIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
XCPPFLAGS+= ${PTHREAD_CFLAGS}
XLDFLAGS+= ${PTHREAD_LIBS}
XSCONS_ENV+= jack=1
X.else
XSCONS_ENV+= jack=0
X.endif
X
X.if defined(WITH_PORTAUDIO)
XLIB_DEPENDS+= portaudio.0:${PORTSDIR}/audio/portaudio
XSCONS_ENV+= portaudio=1
X.else
XSCONS_ENV+= portaudio=0
X.endif
X
X.if defined(WITH_LIBARCHIVE)
XLIB_DEPENDS+= archive:${PORTSDIR}/archivers/libarchive
XSCONS_ENV+= libarchive=1
X.else
XSCONS_ENV+= libarchive=0
X.endif
X
X.if defined(WITH_ALSA)
XLIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
XRUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
XSCONS_ENV+= alsa=1
X.else
XSCONS_ENV+= alsa=0
X.endif
X
X.if defined(WITH_LASH)
XLIB_DEPENDS+= lash.2:${PORTSDIR}/audio/lash
XSCONS_ENV+= lash=1
X.else
XSCONS_ENV+= lash=0
X.endif
X
XSCONS_ENV+= cppflags="${CXXFLAGS}" linkflags="${LINKFLAGS}" prefix="${PREFIX}" CC="${CC}" CXX="${CXX}"
X
Xpre-install:
X -@${RM} -rf ${WRKSRC}/data/doc/man
X
X.include <bsd.port.mk>
464ef7c6571951809b23e262cbe26e19
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/patch-Sconstruct
sed 's/^X//' >./files/patch-Sconstruct << '0858bea9ce2a6db4bebe265bfa9feadc'
X--- Sconstruct.orig 2011-03-15 13:22:35.000000000 +0100
X+++ Sconstruct 2012-10-16 23:24:44.000000000 +0200
X@@ -41,13 +41,13 @@
X
X
X def get_platform_flags( opts ):
X- includes = []
X+ includes = ['-I/usr/local/include/qt4/QtCore', '-I/usr/local/include/qt4/QtXml', '-I/usr/local/include/qt4/QtGui', '-I/usr/local/include/qt4', '-I/usr/local/include/qt4/Qt', '-I/usr/local/include']
X cppflags = []
X- ldflags = []
X+ ldflags = ['-L/usr/local/lib/qt4','-L/usr/local/lib','-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '-pthread']
X
X env = Environment( options = opts )
X
X- if sys.platform == "linux2" or sys.platform == "darwin":
X+ if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform > "freebsd":
X if str(env['debug']) == "1":
X cppflags += ['-Wall', '-g2', '-ggdb', '-O0']
X for flag in env["optflags"].split(" "):
X@@ -91,11 +91,12 @@
X includes.append( '/opt/local/include' )
X includes.append( '/usr/local/include/jack' )
X
X- elif sys.platform == 'linux2':
X+ elif str(env['alsa']) == "1" and sys.platform > 'freebsd' :
X ldflags.append('-lpthread')
X ldflags.append('-lasound')
X # ldflags.append('-lrubberband')
X-
X+ elif sys.platform > 'freebsd' :
X+ print "Alsa disabled; nothing to do"
X elif sys.platform == "win32":
X includes.append( '3rdparty\libsndfile-1_0_17' )
X includes.append( 'build\pthreads\include' )
X@@ -298,7 +299,6 @@
X
X for N in glob.glob('./data/i18n/hydrogen.*'):
X env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
X- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
X
X #add every img in ./data/img to the install list.
X os.path.walk("./data/img/",install_images,env)
0858bea9ce2a6db4bebe265bfa9feadc
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210162155.q9GLtjZ3086583>