Bugfixing update to audacious/audacious-plugins 2.4.5.
tested and ok shadchin@
This commit is contained in:
dcoppa
parent
29aed87b1b
commit
82248dd050
@ -1,15 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2011/04/27 11:45:16 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2011/05/08 14:08:44 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
COMMENT-main = input and output plugins for audacious
|
||||
COMMENT-jack = jack plugin for audacious
|
||||
|
||||
V = 2.4.4
|
||||
V = 2.4.5
|
||||
DISTNAME = audacious-plugins-$V
|
||||
PKGNAME-main = ${DISTNAME}
|
||||
REVISION-main = 3
|
||||
REVISION-jack= 1
|
||||
PKGNAME-jack = audacious-jack-$V
|
||||
|
||||
CATEGORIES = audio multimedia
|
||||
@ -47,7 +45,7 @@ MODULES = devel/gettext
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS-main}
|
||||
|
||||
RUN_DEPENDS-main = audio/audacious>=2.4.4
|
||||
RUN_DEPENDS-main = audio/audacious>=${V}
|
||||
RUN_DEPENDS-jack = audio/audacious-plugins,-main
|
||||
|
||||
LIB_DEPENDS-main = audio/faad \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (audacious-plugins-2.4.4.tgz) = 4LCXvuup2nCJbR42iImWyA==
|
||||
RMD160 (audacious-plugins-2.4.4.tgz) = 2OyV+2eO/Lms0X53uJDUxoXCuJI=
|
||||
SHA1 (audacious-plugins-2.4.4.tgz) = M6Q83LaZV4rMvBgZGLltpqsEztw=
|
||||
SHA256 (audacious-plugins-2.4.4.tgz) = JJSK4hYd3eWAvK0n28EfrtDKzRQiUnSeZNpfj16AhOQ=
|
||||
SIZE (audacious-plugins-2.4.4.tgz) = 3425914
|
||||
MD5 (audacious-plugins-2.4.5.tgz) = g+/0fKBj2ZVadwOcHhwYow==
|
||||
RMD160 (audacious-plugins-2.4.5.tgz) = wjJa9muqpGJx2wcjAuu6QqRQWBQ=
|
||||
SHA1 (audacious-plugins-2.4.5.tgz) = naSKTgkk/j+1tUEu3aGkTJEGSXg=
|
||||
SHA256 (audacious-plugins-2.4.5.tgz) = gw+mQ+/lmpBsEKmnTV4QXwHsISbTEBdSUUPG7oLXIS8=
|
||||
SIZE (audacious-plugins-2.4.5.tgz) = 3422727
|
||||
|
||||
@ -1,21 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.7 2011/04/01 03:24:25 jakemsr Exp $
|
||||
--- configure.ac.orig Tue Feb 22 12:29:46 2011
|
||||
+++ configure.ac Thu Mar 31 20:40:59 2011
|
||||
@@ -785,10 +785,10 @@ dnl In 2010, some libavcodec functions were moved into
|
||||
dnl libavcore, making our checks here a bit complex.
|
||||
|
||||
if test $enable_ffaudio = yes ; then
|
||||
- PKG_CHECK_MODULES([NEED_AVCORE], [libavcodec >= 52.94.3],
|
||||
- [have_new_ffmpeg=yes], [have_new_ffmpeg=no])
|
||||
+ PKG_CHECK_MODULES([NEED_AVCORE], [libavcodec >= 52.94.3 libavcodec <= 52.113.1],
|
||||
+ [have_split_ffmpeg=yes], [have_split_ffmpeg=no])
|
||||
|
||||
- if test $have_new_ffmpeg = yes ; then
|
||||
+ if test $have_split_ffmpeg = yes ; then
|
||||
PKG_CHECK_MODULES([FFMPEG],
|
||||
[libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0],
|
||||
[have_ffaudio=yes], [have_ffaudio=no])
|
||||
@@ -809,13 +809,21 @@ AC_ARG_ENABLE( jack,
|
||||
$OpenBSD: patch-configure_ac,v 1.8 2011/05/08 14:08:44 dcoppa Exp $
|
||||
--- configure.ac.orig Sun Apr 17 15:29:25 2011
|
||||
+++ configure.ac Wed May 4 11:22:08 2011
|
||||
@@ -810,13 +810,21 @@ AC_ARG_ENABLE( jack,
|
||||
[enable_jack="yes"])
|
||||
|
||||
if test "x$enable_jack" = "xyes"; then
|
||||
@ -40,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2011/04/01 03:24:25 jakemsr Exp $
|
||||
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
|
||||
fi
|
||||
|
||||
@@ -1196,7 +1204,7 @@ have_solaris=no
|
||||
@@ -1197,7 +1205,7 @@ have_solaris=no
|
||||
have_sun=no
|
||||
ARCH_DEFINES=""
|
||||
case "$host" in
|
||||
@ -49,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2011/04/01 03:24:25 jakemsr Exp $
|
||||
have_sun=yes
|
||||
if test "${is_elf}" = "no"
|
||||
then
|
||||
@@ -1204,6 +1212,12 @@ case "$host" in
|
||||
@@ -1205,6 +1213,12 @@ case "$host" in
|
||||
fi
|
||||
OUTPUT_PLUGINS="$OUTPUT_PLUGINS sun"
|
||||
;;
|
||||
@ -62,7 +48,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2011/04/01 03:24:25 jakemsr Exp $
|
||||
*-*-darwin*)
|
||||
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
|
||||
;;
|
||||
@@ -1557,6 +1571,20 @@ if test "x$enable_lyricwiki" = "xyes"; then
|
||||
@@ -1558,6 +1572,20 @@ if test "x$enable_lyricwiki" = "xyes"; then
|
||||
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
|
||||
fi
|
||||
|
||||
@ -83,7 +69,16 @@ $OpenBSD: patch-configure_ac,v 1.7 2011/04/01 03:24:25 jakemsr Exp $
|
||||
dnl *** End of all plugin checks ***
|
||||
|
||||
AC_SUBST(ARCH_DEFINES)
|
||||
@@ -1652,6 +1680,7 @@ echo " -> FileWriter MP3 output part: $have_
|
||||
@@ -1645,7 +1673,7 @@ echo " Open Sound System v4 (oss4): $have_
|
||||
echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
|
||||
echo " PulseAudio (pulse): $have_pulse"
|
||||
echo " RoarAudio (roaraudio): $have_roar"
|
||||
-echo " Jack Audio Connection Kit (jack): $have_jack"
|
||||
+echo " Jack Audio Connection Kit (jack): $enable_jack"
|
||||
echo " BSD/SUN audio output (sun): $have_sun"
|
||||
echo " Mac OS X sound support (CoreAudio): $have_coreaudio"
|
||||
echo " FileWriter: $enable_filewriter"
|
||||
@@ -1653,6 +1681,7 @@ echo " -> FileWriter MP3 output part: $have_
|
||||
echo " -> FileWriter Vorbis output part: $have_vorbisenc"
|
||||
echo " -> FileWriter FLAC output part: $have_writer_flac"
|
||||
echo " Null Audio output (null): yes"
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
$OpenBSD: patch-src_aac_libmp4_c,v 1.7 2011/03/02 14:07:55 shadchin Exp $
|
||||
--- src/aac/libmp4.c.orig Tue Feb 22 22:29:46 2011
|
||||
+++ src/aac/libmp4.c Wed Feb 23 21:59:39 2011
|
||||
$OpenBSD: patch-src_aac_libmp4_c,v 1.8 2011/05/08 14:08:44 dcoppa Exp $
|
||||
|
||||
Our faad port uses a patched neaacdec.h header
|
||||
|
||||
--- src/aac/libmp4.c.orig Sun Apr 17 15:29:25 2011
|
||||
+++ src/aac/libmp4.c Wed May 4 12:04:11 2011
|
||||
@@ -64,7 +64,7 @@ static guint32 mp4_read_callback(void *data, void *buf
|
||||
return vfs_fread(buffer, 1, len, (VFSFile *) data);
|
||||
}
|
||||
@ -10,6 +13,15 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.7 2011/03/02 14:07:55 shadchin Exp $
|
||||
{
|
||||
g_return_val_if_fail (data != NULL, -1);
|
||||
g_return_val_if_fail (pos <= G_MAXINT64, -1);
|
||||
@@ -353,7 +353,7 @@ static void calc_aac_info (VFSFile * handle, gint * le
|
||||
if (! initted)
|
||||
{
|
||||
gint inner, a;
|
||||
- gulong r;
|
||||
+ guint r;
|
||||
guchar ch;
|
||||
|
||||
inner = find_aac_header (buffer + offset, filled, & a);
|
||||
@@ -583,7 +583,7 @@ static int my_decode_mp4( InputPlayback *playback, cha
|
||||
NeAACDecHandle decoder;
|
||||
guchar *buffer = NULL;
|
||||
@ -19,3 +31,21 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.7 2011/03/02 14:07:55 shadchin Exp $
|
||||
guchar channels = 0;
|
||||
guint numSamples;
|
||||
gulong sampleID = 1;
|
||||
@@ -771,7 +771,7 @@ static void aac_seek (VFSFile * file, NeAACDecHandle d
|
||||
}
|
||||
|
||||
guchar chan;
|
||||
- gulong rate;
|
||||
+ guint rate;
|
||||
* used += NeAACDecInit (dec, buf + * used, * fill - * used, & rate, & chan);
|
||||
|
||||
AUDDBG ("After init, used %d of %d bytes.\n", * used, * fill);
|
||||
@@ -782,7 +782,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
|
||||
NeAACDecHandle decoder = 0;
|
||||
guchar streambuffer[BUFFER_SIZE];
|
||||
gint bufferconsumed = 0;
|
||||
- gulong samplerate = 0;
|
||||
+ guint samplerate = 0;
|
||||
guchar channels = 0;
|
||||
gint buffervalid = 0;
|
||||
gulong ret = 0;
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_neon_cert_verification_c,v 1.1 2011/05/08 14:08:44 dcoppa Exp $
|
||||
--- src/neon/cert_verification.c.orig Wed May 4 11:57:45 2011
|
||||
+++ src/neon/cert_verification.c Wed May 4 11:58:05 2011
|
||||
@@ -17,7 +17,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <ne_ssl.h>
|
||||
@ -1,12 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2011/05/06 09:43:08 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2011/05/08 14:08:44 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
COMMENT = gtk+2 media player based on BMP and XMMS
|
||||
|
||||
DISTNAME = audacious-2.4.4
|
||||
|
||||
REVISION = 1
|
||||
DISTNAME = audacious-2.4.5
|
||||
|
||||
SHARED_LIBS = audclient 1.1 # 2.0
|
||||
SHARED_LIBS += audcore 0.0 # 1.0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (audacious-2.4.4.tgz) = Mp/dnsJUVgEO6QlTqqf8Dg==
|
||||
RMD160 (audacious-2.4.4.tgz) = dclgsViztjZ8ykp9pl2Y2KNaE9k=
|
||||
SHA1 (audacious-2.4.4.tgz) = aXsswhfO+Xhc9+wMTuYXvBdPvpg=
|
||||
SHA256 (audacious-2.4.4.tgz) = dvhAOKA2DagK6t3R7CPlpV/uWhIKv/zpfEYJlYzbMOg=
|
||||
SIZE (audacious-2.4.4.tgz) = 1344519
|
||||
MD5 (audacious-2.4.5.tgz) = +8yw7IfY0sRbJAyWiOBVQA==
|
||||
RMD160 (audacious-2.4.5.tgz) = npT/4mqx+wUz7I8j9mGgZGTeDbg=
|
||||
SHA1 (audacious-2.4.5.tgz) = XtwdeBRbDisGLxq7pWwLCED3VG4=
|
||||
SHA256 (audacious-2.4.5.tgz) = JIl+GtbtEwd2Mo7gMO1AZnux4c5paHr6Im5QTHJIoXA=
|
||||
SIZE (audacious-2.4.5.tgz) = 1347079
|
||||
|
||||
Loading…
Reference in New Issue
Block a user