pkg/50803: replace audio/moc and audio/moc-devel with stable 2.5.0 version

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/50803: replace audio/moc and audio/moc-devel with stable 2.5.0 version
From: Onno van der Linden <o.vd.linden%quicknet.nl@localhost>
Date: Sun, 14 Feb 2016 19:50:00 +0000 (UTC)
>Number:         50803
>Category:       pkg
>Synopsis:       audio/moc and audio/moc-devel are using older versions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 14 19:50:00 +0000 2016
>Originator:     Onno van der Linden
>Release:        NetBSD 7.99.25
>Organization:
>Environment:
System: NetBSD sheep 7.99.25 NetBSD 7.99.25 (SHEEP) #9: Sun Jan 3 09:04:37 MET 2016 onno@sheep:/usr/src/sys/arch/i386/compile/SHEEP i386
Architecture: i386
Machine: i386
>Description:
audio/moc has 2.4.4 and audio/moc-devel has 2.5.0-beta1.
moc 2.5.0 has been available since Aug 30 2014.
Use that stable version in audio/moc and remove audio/moc-devel
>How-To-Repeat:
N.A.
>Fix:
Remove audio/moc-devel and replace audio/moc with stuff in
the shar file below.
Difference in package is mainly the removal of a couple of
patches that are not needed anymore. If the autoreconf
is still needed (currently commented out)
patch-ab, patch-ac and patch-decoder__plugins_vorbis_vorbis.m4
from audio/moc-devel/patches should be added.

For the commit message here are the changes between
2.5.0-beta1 and 2.5.0 based on a diff of the NEWS file
(shar with the package files further down):

	* Autotools and packaging changes:
	  - Updated GNU boilerplate text
        * New and changed audio decoders:
	  - Removed WAV format support from ModPlug decoder plugin
	* New and changed audio decoders:
	  - Detect huge files in certain formats which SndFile cannot play
        * Overhauled FFmpeg/LibAV decoder:
	  - Improved (drastically in some cases) the accuracy of AAC durations
        * Overhauled FFmpeg/LibAV decoder:
	  - Provided locking support for non-thread-safe library functions
	  - Provided better FFmpeg or LibAV discrimination
	  - Provided better audio duration reliability determination
	  - Added handling for "planar" codecs
	  - Excluded experimental codecs from decoding
	  - Fixed many FFmpeg/LibAV API breakages
	  - Detect over-length (and therefore broken) WAV files
	  - Fixed log formatting when FFmpeg messages contain newline characters
        * Audio reproduction changes:
	  - Fixed bugs in 24-bit sample handling (Tomasz Golinski)
        * General configuration file changes:
	  - Automatic clearing of an overridden default key binding
	  - Made processing of keymap file consistant with that of config file
        * Screen handling changes:
	  - Populated playlist panel when loading default playlist file
	  - Removed default playlist autofocus at start
	  - Fixed some screen upsets when tags contain UTF-8 characters (firejox)
	  - Fixed screen upset caused by screen(1) mis-detection
 	* New and updated client interaction features:
	  - Clear status message after a stream open failure
	  - Minor help menu clarifications
	  - Fixed cursor placement in themes menu (Alex Merenstein)
	  - Fixed ordering of theme files in themes menu
	  - Fixed new attributes application on theme switching (Alex Merenstein)
 	* General code cleaning:
	  - Improved thread safety
 	* Significant bug fixes:
	  - Fixed client interface meta-key handling
	  - Fixed assertion when a second client is started
	  - Fixed slow memory leak in client on long-playing streams
	  - Fixed handling of huge (greater than 2 GiB) files
	  - Fixed sub-second audio truncation on ALSA
	  - Fixed segfault when MIME-detected MP3 file has no "extension"
	  - Fixed segfault when using '--format' without an audio playing
	  - Fixed nonsense duration values returned on some corrupt FLAC files
	  - Fixed 'time >= 0' assertion at change of audio file
	  - Fixed client event notification failure in some circumstances
	  - Fixed client abort on duplicated playlist filenames
	  - Fixed delayed client exit when server invokes long-running scripts
	    (Alex Merenstein)
	  - Fixed occasional server freeze on logging when running scripts
	  - Fixed non-conforming 'User-Agent' HTTP request header
        * Miscellaneous:
	  - Fixed frames to duration calculations in ALSA
	  - Fixed some mutex management bugs


# 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:
#
#	DESCR
#	Makefile
#	PLIST
#	options.mk
#	patch-ad
#	patch-playlist__file.c
#
echo x - DESCR
sed 's/^X//' >DESCR << 'END-of-DESCR'
XMOC (music on console) is a console audio player for LINUX/UNIX
Xdesigned to be powerful and easy to use. Noteworthy features
Xinclude:
X
X  * By default, files are decoded and played in a background
X    process. This allows the user to quit the interface (e.g.,
X    if one needs to close the xterm) without affecting
X    playback. It also allows attaching multiple interfaces
X    (e.g. in multiple xterms) to the same player.
X  * Playback should be smooth even under high cpu or I/O load,
X    due to the use of output buffering in a separate thread.
X  * There are no sound gaps in between files, because the next
X    file to be played is precached while playing the current
X    file.
X
XNote: To avoid conflicts with Qt's 'moc', the moc binary is
Xcalled 'mocp'.
END-of-DESCR
echo x - Makefile
sed 's/^X//' >Makefile << 'END-of-Makefile'
X# $NetBSD: Makefile,v 1.19 2015/12/09 01:39:10 wiedi Exp $
X
XDISTNAME=		moc-2.5.0
XCATEGORIES=		audio
XMASTER_SITES=		http://ftp.daper.net/pub/soft/moc/stable/
XEXTRACT_SUFX=		.tar.bz2
X
XMAINTAINER=		peter.schuller%infidyne.com@localhost
XHOMEPAGE=		http://moc.daper.net/
XCOMMENT=		Curses based console audio player
XLICENSE=		gnu-gpl-v2
X
XCONFLICTS=		moc-[0-9]*
X
XGNU_CONFIGURE=		yes
XUSE_PKGLOCALEDIR=	yes
XUSE_LIBTOOL=		yes
XUSE_TOOLS+=		pkg-config
X#USE_TOOLS+=		autoconf automake
X
XSUBST_CLASSES+=		oss
XSUBST_STAGE.oss=	pre-configure
XSUBST_FILES.oss=	config.example options.c
XSUBST_SED.oss=		-e s,/dev/dsp,${DEVOSSAUDIO},g
XSUBST_MESSAGE.oss=	Fixing hardcoded audio device.
X
X.include "options.mk"
X###
X### This target is [currently] for regenerating configure to add the
X### sched_get_priority_max check of librt.
X###
X#pre-configure:
X#	cd ${WRKSRC} && autoreconf -v -i
X
XLDFLAGS.SunOS+=		-lsocket
X
XBUILDLINK_TRANSFORM+=	l:db:db4
X
X# ${PREFIX}/bin/mocp contains path to pkg-config in work/.tools/.
X# It is harmless.
XCHECK_WRKREF_SKIP=	bin/mocp
X
X.include "../../audio/libid3tag/buildlink3.mk"
X.include "../../audio/libmad/buildlink3.mk"
X.include "../../databases/db4/buildlink3.mk"
X.include "../../devel/gettext-lib/buildlink3.mk"
X.include "../../devel/libltdl/buildlink3.mk"
X.include "../../mk/curses.buildlink3.mk"
X.include "../../mk/oss.buildlink3.mk"
X.include "../../mk/pthread.buildlink3.mk"
X.include "../../mk/bsd.pkg.mk"
END-of-Makefile
echo x - PLIST
sed 's/^X//' >PLIST << 'END-of-PLIST'
X@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:18 joerg Exp $
Xbin/mocp
X${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la
Xlib/moc/decoder_plugins/libmp3_decoder.la
X${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la
X${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_decoder.la
X${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la
Xman/man1/mocp.1
Xshare/doc/moc/README
Xshare/doc/moc/README_equalizer
Xshare/doc/moc/THANKS
Xshare/doc/moc/config.example
Xshare/doc/moc/keymap.example
Xshare/moc/themes/black_theme
Xshare/moc/themes/darkdot_theme
Xshare/moc/themes/example_theme
Xshare/moc/themes/green_theme
Xshare/moc/themes/moca_theme
Xshare/moc/themes/nightly_theme
Xshare/moc/themes/red_theme
Xshare/moc/themes/transparent-background
Xshare/moc/themes/yellow_red_theme
END-of-PLIST
echo x - options.mk
sed 's/^X//' >options.mk << 'END-of-options.mk'
X# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:58 jlam Exp $
X
XPKG_OPTIONS_VAR=	PKG_OPTIONS.moc
XPKG_SUPPORTED_OPTIONS=	sndfile flac vorbis speex curl samplerate jack
XPKG_SUGGESTED_OPTIONS=	sndfile flac vorbis curl
X
X.include "../../mk/bsd.options.mk"
X
XPLIST_VARS+=		flac sndfile speex vorbis
X
X.if !empty(PKG_OPTIONS:Mjack)
XCONFIGURE_ARGS+=	--with-jack
X###
X### Resampling support is usually required with jack.
X###
X.  include "../../audio/jack/buildlink3.mk"
X.  if empty(PKG_OPTIONS:Msamplerate)
XPKG_OPTIONS+=		samplerate
X.  endif
X.else
XCONFIGURE_ARGS+=	--without-jack
X.endif
X
X.if !empty(PKG_OPTIONS:Msamplerate)
XCONFIGURE_ARGS+=	--with-samplerate
X.  if empty(PKG_OPTIONS:Msndfile)
XPKG_OPTIONS+=		sndfile
X.  endif
X.  include "../../audio/libsamplerate/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-samplerate
X.endif
X
X.if !empty(PKG_OPTIONS:Msndfile)
XPLIST.sndfile=		yes
XCONFIGURE_ARGS+=	--with-sndfile
X.  include "../../audio/libsndfile/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-sndfile
X.endif
X
X.if !empty(PKG_OPTIONS:Mflac)
XPLIST.flac=		yes
XCONFIGURE_ARGS+=	--with-flac
X.  include "../../audio/flac/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-flac
X.endif
X
X.if !empty(PKG_OPTIONS:Mvorbis)
XPLIST.vorbis=		yes
XCONFIGURE_ARGS+=	--with-vorbis
X.  include "../../audio/libvorbis/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-vorbis
X.endif
X
X.if !empty(PKG_OPTIONS:Mspeex)
XPLIST.speex=		yes
XCONFIGURE_ARGS+=	--with-speex
X.  include "../../audio/speex/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-speex
X.endif
X
X.if !empty(PKG_OPTIONS:Mcurl)
XCONFIGURE_ARGS+=	--with-curl
X.  include "../../www/curl/buildlink3.mk"
X.else
XCONFIGURE_ARGS+=	--without-curl
X.endif
END-of-options.mk
echo x - patch-ad
sed 's/^X//' >patch-ad << 'END-of-patch-ad'
X$NetBSD: patch-ad,v 1.3 2011/09/12 06:27:21 dholland Exp $
X
Xregen after patching configure.in:
X
X- check for sched_get_priority_max being in -lrt
X
X--- configure.orig	2012-10-11 19:45:04.000000000 +0000
X+++ configure
X@@ -24165,6 +24165,72 @@ eval as_val=\$$as_ac_var
X #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
X _ACEOF
X 
X+else
X+  { echo "$as_me:$LINENO: checking for sched_get_priority_max in -lrt" >&5
X+echo $ECHO_N "checking for sched_get_priority_max in -lrt... $ECHO_C" >&6; }
X+if test "${ac_cv_lib_rt_sched_get_priority_max+set}" = set; then
X+  echo $ECHO_N "(cached) $ECHO_C" >&6
X+else
X+  ac_check_lib_save_LIBS=$LIBS
X+LIBS="-lrt  $LIBS"
X+cat >conftest.$ac_ext <<_ACEOF
X+/* confdefs.h.  */
X+_ACEOF
X+cat confdefs.h >>conftest.$ac_ext
X+cat >>conftest.$ac_ext <<_ACEOF
X+/* end confdefs.h.  */
X+
X+/* Override any GCC internal prototype to avoid an error.
X+   Use char because int might match the return type of a GCC
X+   builtin and then its argument prototype would still apply.  */
X+#ifdef __cplusplus
X+extern "C"
X+#endif
X+char sched_get_priority_max ();
X+int
X+main ()
X+{
X+return sched_get_priority_max ();
X+  ;
X+  return 0;
X+}
X+_ACEOF
X+rm -f conftest.$ac_objext conftest$ac_exeext
X+if { (ac_try="$ac_link"
X+case "(($ac_try" in
X+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
X+  *) ac_try_echo=$ac_try;;
X+esac
X+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
X+  (eval "$ac_link") 2>conftest.er1
X+  ac_status=$?
X+  grep -v '^ *+' conftest.er1 >conftest.err
X+  rm -f conftest.er1
X+  cat conftest.err >&5
X+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
X+  (exit $ac_status); } && {
X+	 test -z "$ac_c_werror_flag" ||
X+	 test ! -s conftest.err
X+       } && test -s conftest$ac_exeext &&
X+       $as_test_x conftest$ac_exeext; then
X+  ac_cv_lib_rt_sched_get_priority_max=yes
X+else
X+  echo "$as_me: failed program was:" >&5
X+sed 's/^/| /' conftest.$ac_ext >&5
X+
X+	ac_cv_lib_rt_sched_get_priority_max=no
X+fi
X+
X+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
X+      conftest$ac_exeext conftest.$ac_ext
X+LIBS=$ac_check_lib_save_LIBS
X+fi
X+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sched_get_priority_max" >&5
X+echo "${ECHO_T}$ac_cv_lib_rt_sched_get_priority_max" >&6; }
X+if test $ac_cv_lib_rt_sched_get_priority_max = yes; then
X+  EXTRA_LIBS="$EXTRA_LIBS -lrt"
X+fi
X+
X fi
X done
X 
X@@ -25078,6 +25144,7 @@ if ac_fn_c_try_link "$LINENO"; then :
X   mp_cv_ncursesw=yes
X else
X   mp_cv_ncursesw=no
X+  LIBS="$mp_save_LIBS"
X fi
X rm -f core conftest.err conftest.$ac_objext \
X     conftest$ac_exeext conftest.$ac_ext
X@@ -27422,7 +27489,7 @@ if test "${with_vorbis+set}" = set; then
X fi
X 
X 
X-if test "x$with_vorbis" == "xtremor"
X+if test "x$with_vorbis" = "xtremor"
X then
X 
X pkg_failed=no
END-of-patch-ad
echo x - patch-playlist__file.c
sed 's/^X//' >patch-playlist__file.c << 'END-of-patch-playlist__file.c'
X$NetBSD: patch-playlist__file.c,v 1.1 2012/01/11 19:08:55 hans Exp $
X
X--- playlist_file.c.orig	2012-08-16 06:44:35.000000000 +0000
X+++ playlist_file.c
X@@ -90,9 +90,11 @@ static int plist_load_m3u (struct plist 
X 		return 0;
X 	}
X 
X+#ifndef __sun
X 	/* Lock gets released by fclose(). */
X 	if (flock (fileno (file), LOCK_SH) == -1)
X 		logit ("Can't flock() the playlist file: %s", strerror (errno));
X+#endif
X 
X 	while ((line = read_line (file))) {
X 		if (!strncmp (line, "#EXTINF:", sizeof("#EXTINF:") - 1)) {
X@@ -412,9 +414,11 @@ static int plist_save_m3u (struct plist 
X 		return 0;
X 	}
X 
X+#ifndef __sun
X 	/* Lock gets released by fclose(). */
X 	if (flock (fileno (file), LOCK_EX) == -1)
X 		logit ("Can't flock() the playlist file: %s", strerror (errno));
X+#endif
X 
X 	if (fprintf (file, "#EXTM3U\r\n") < 0) {
X 		error ("Error writing playlist: %s", strerror (errno));
END-of-patch-playlist__file.c
exit
Prev by Date: PR/50358 CVS commit: pkgsrc/chat/weechat
Next by Date: PR/50800 CVS commit: pkgsrc/mail/postfix-pgsql
Previous by Thread: PR/50358 CVS commit: pkgsrc/chat/weechat
Next by Thread: PR/50800 CVS commit: pkgsrc/mail/postfix-pgsql
Indexes:
Home | Main Index | Thread Index | Old Index