From owner-svn-ports-all@freebsd.org Wed Jul 29 23:34:30 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 823A49AE784; Wed, 29 Jul 2015 23:34:30 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.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 67336F5C; Wed, 29 Jul 2015 23:34:30 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6TNYUsI001499; Wed, 29 Jul 2015 23:34:30 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6TNYSpS001494; Wed, 29 Jul 2015 23:34:28 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201507292334.t6TNYSpS001494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Wed, 29 Jul 2015 23:34:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393205 - in head/audio/harp: . files X-SVN-Group: ports-head 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.20 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: Wed, 29 Jul 2015 23:34:30 -0000 Author: wen Date: Wed Jul 29 23:34:27 2015 New Revision: 393205 URL: https://svnweb.freebsd.org/changeset/ports/393205 Log: - Update to 0.6.0 PR: 201928 Submitted by: heckendorfc@gmail.com(maintainer) Added: head/audio/harp/files/ head/audio/harp/files/patch-shuffle.c (contents, props changed) Modified: head/audio/harp/Makefile head/audio/harp/distinfo head/audio/harp/pkg-descr head/audio/harp/pkg-plist Modified: head/audio/harp/Makefile ============================================================================== --- head/audio/harp/Makefile Wed Jul 29 23:28:35 2015 (r393204) +++ head/audio/harp/Makefile Wed Jul 29 23:34:27 2015 (r393205) @@ -1,47 +1,62 @@ # $FreeBSD$ PORTNAME= harp -PORTVERSION= 0.5.2 -PORTREVISION= 5 +PORTVERSION= 0.6.0 CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME} MAINTAINER= heckendorfc@gmail.com COMMENT= Minimalist audio player LICENSE= GPLv3 -USES= libtool -GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= heckendorfc +GH_TAGNAME= ${PORTVERSION} + +USES= cmake USE_SQLITE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= AAC FLAC MP3 SHOUTCAST VORBIS JACK DOCS -OPTIONS_DEFAULT= AAC FLAC MP3 SHOUTCAST VORBIS +OPTIONS_DEFINE= AAC FLAC MP3 SHOUTCAST VORBIS DOCS +OPTIONS_SINGLE= AUDIO_OUT +OPTIONS_SINGLE_AUDIO_OUT= JACK OSS PULSEAUDIO +OPTIONS_DEFAULT= AAC FLAC MP3 OSS SHOUTCAST VORBIS OPTIONS_SUB= yes PORTDOCS= README -INSTALL_TARGET= install-strip - AAC_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad -AAC_CONFIGURE_WITH= aac +AAC_CMAKE_ON= -DWITH_AAC:BOOL=ON +AAC_CMAKE_OFF= -DWITH_AAC:BOOL=OFF FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac -FLAC_CONFIGURE_WITH= flac +FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON +FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF MP3_LIB_DEPENDS+= libmpg123.so:${PORTSDIR}/audio/mpg123 -MP3_CONFIGURE_WITH= mp3 +MP3_CMAKE_ON= -DWITH_MP3:BOOL=ON +MP3_CMAKE_OFF= -DWITH_MP3:BOOL=OFF -SHOUTCAST_CONFIGURE_WITH= stream +SHOUTCAST_CMAKE_ON= -DWITH_STREAM:BOOL=ON +SHOUTCAST_CMAKE_OFF= -DWITH_STREAM:BOOL=OFF VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -VORBIS_CONFIGURE_WITH= vorbis +VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON +VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF + +OSS_CMAKE_ON= -DWITH_OSS:BOOL=ON +OSS_CMAKE_OFF= -DWITH_OSS:BOOL=OFF -JACK_CONFIGURE_WITH= jack JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_LIB_DEPENDS+= libsamplerate.so:${PORTSDIR}/audio/libsamplerate +JACK_CMAKE_ON= -DWITH_JACK:BOOL=ON +JACK_CMAKE_OFF= -DWITH_JACK:BOOL=OFF + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CMAKE_ON= -DWITH_PULSE:BOOL=ON +PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE:BOOL=OFF post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/audio/harp/distinfo ============================================================================== --- head/audio/harp/distinfo Wed Jul 29 23:28:35 2015 (r393204) +++ head/audio/harp/distinfo Wed Jul 29 23:34:27 2015 (r393205) @@ -1,2 +1,2 @@ -SHA256 (harp-0.5.2.tar.gz) = 49ec8815083000e50fc9cf9ca066571c0644f209f71feba068af2f413ceffd93 -SIZE (harp-0.5.2.tar.gz) = 392452 +SHA256 (heckendorfc-harp-0.6.0_GH0.tar.gz) = 5402c6c7aceefae6f34960292d51121dfa1a8fc46afaf910fc2ce203f865937e +SIZE (heckendorfc-harp-0.6.0_GH0.tar.gz) = 109887 Added: head/audio/harp/files/patch-shuffle.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/harp/files/patch-shuffle.c Wed Jul 29 23:34:27 2015 (r393205) @@ -0,0 +1,23 @@ +--- shuffle.c.orig 2015-07-30 06:53:22.145389293 +0800 ++++ shuffle.c 2015-07-30 06:54:51.465466007 +0800 +@@ -159,10 +159,7 @@ + const unsigned int items; + const unsigned int group_items; + const unsigned int increment; +- union{ +- const unsigned int skip; +- const unsigned int slide; +- }; ++ const unsigned int slide; + unsigned int count; + int slidemod; + char *query; +@@ -260,7 +257,7 @@ + struct candidate_data candlist; + + srandom((unsigned int)time(NULL)); +- struct zs_arg data={.items=items,.group_items=group,.increment=(random()%2)+2,.skip=(random()%3)+2,.count=0,.slidemod=1,.query=cb_query}; ++ struct zs_arg data={.items=items,.group_items=group,.increment=(random()%2)+2,.slide=(random()%3)+2,.count=0,.slidemod=1,.query=cb_query}; + + sprintf(query,"Mod count: %d\nGroup: %d\nIncrement: %d",mod_count,group,data.increment); + debug(2,query); Modified: head/audio/harp/pkg-descr ============================================================================== --- head/audio/harp/pkg-descr Wed Jul 29 23:28:35 2015 (r393204) +++ head/audio/harp/pkg-descr Wed Jul 29 23:34:27 2015 (r393205) @@ -2,4 +2,4 @@ HARP is a music player designed for the minimalist users with a suitable replacement for music players with bulky user interfaces. -WWW: http://harp.sourceforge.net/ +WWW: http://github.com/heckendorfc/harp Modified: head/audio/harp/pkg-plist ============================================================================== --- head/audio/harp/pkg-plist Wed Jul 29 23:28:35 2015 (r393204) +++ head/audio/harp/pkg-plist Wed Jul 29 23:34:27 2015 (r393205) @@ -1,19 +1,5 @@ bin/harp -%%AAC%%lib/libharpaac.a -%%AAC%%lib/libharpaac.so -%%FLAC%%lib/libharpflac.a -%%FLAC%%lib/libharpflac.so -%%MP3%%lib/libharpmp3.a -%%MP3%%lib/libharpmp3.so -%%SHOUTCAST%%lib/libharpstream.a -%%SHOUTCAST%%lib/libharpstream.so -%%VORBIS%%lib/libharpvorbis.a -%%VORBIS%%lib/libharpvorbis.so -%%AAC%%%%DATADIR%%/libharpaac.sql -%%FLAC%%%%DATADIR%%/libharpflac.sql -%%MP3%%%%DATADIR%%/libharpmp3.sql -%%SHOUTCAST%%%%DATADIR%%/libharpstream.sql -%%VORBIS%%%%DATADIR%%/libharpvorbis.sql man/man1/harp.1.gz %%DATADIR%%/create.sql %%DATADIR%%/defaults.conf +@dir %%DATADIR%%