cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.4.4

Browse Source 
ok jasper@
This commit is contained in:
shadchin 2011-03-02 14:07:09 +00:00
parent a468f0d73c
commit fa43369e74
7 changed files with 52 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/audacious-plugins/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.26 2010/12/27 12:08:21 shadchin Exp $
# $OpenBSD: Makefile,v 1.27 2011/03/02 14:07:54 shadchin Exp $
SHARED_ONLY = Yes
COMMENT-main = input and output plugins for audacious
COMMENT-jack = jack plugin for audacious
V = 2.4.2
V = 2.4.4
DISTNAME = audacious-plugins-$V
PKGNAME-main = ${DISTNAME}
PKGNAME-jack = audacious-jack-$V
REVISION-main = 0
CATEGORIES = audio multimedia
@ -43,7 +42,7 @@ MULTI_PACKAGES = -main
BUILD_DEPENDS = ${RUN_DEPENDS-main}
RUN_DEPENDS-main = audio/audacious>=1.5.1
RUN_DEPENDS-main = audio/audacious>=2.4.4
RUN_DEPENDS-jack = audio/audacious-plugins,-main
LIB_DEPENDS-main = audio/faad \

10
audio/audacious-plugins/distinfo
View File

@ -1,5 +1,5 @@
MD5 (audacious-plugins-2.4.2.tgz) = wz0Opn6PuNbtOJHUZNUAmw==
RMD160 (audacious-plugins-2.4.2.tgz) = 2JRpQviHXhDz3Xzogbopa6m6nTM=
SHA1 (audacious-plugins-2.4.2.tgz) = B6DArGW8AaqTZFTalVCtmC5muPA=
SHA256 (audacious-plugins-2.4.2.tgz) = v3tot7zXpBEHZ15skw4zoREwUiwL1ToytPvSqjxeW6g=
SIZE (audacious-plugins-2.4.2.tgz) = 3420880
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

18
audio/audacious-plugins/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
--- configure.ac.orig Tue Dec 7 18:14:55 2010
+++ configure.ac Sat Dec 25 23:56:42 2010
@@ -793,13 +793,21 @@ AC_ARG_ENABLE( jack,
$OpenBSD: patch-configure_ac,v 1.6 2011/03/02 14:07:55 shadchin Exp $
--- configure.ac.orig Tue Feb 22 22:29:46 2011
+++ configure.ac Wed Feb 23 21:59:42 2011
@@ -809,13 +809,21 @@ AC_ARG_ENABLE( jack,
[enable_jack="yes"])
if test "x$enable_jack" = "xyes"; then
@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
fi
@@ -1178,7 +1186,7 @@ have_solaris=no
@@ -1196,7 +1204,7 @@ have_solaris=no
have_sun=no
ARCH_DEFINES=""
case "$host" in
@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
have_sun=yes
if test "${is_elf}" = "no"
then
@@ -1186,6 +1194,12 @@ case "$host" in
@@ -1204,6 +1212,12 @@ case "$host" in
fi
OUTPUT_PLUGINS="$OUTPUT_PLUGINS sun"
;;
@ -48,8 +48,8 @@ $OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
*-*-darwin*)
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
;;
@@ -1524,6 +1538,20 @@ if test "x$enable_resample" = "xyes"; then
EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
@@ -1557,6 +1571,20 @@ if test "x$enable_lyricwiki" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
fi
+dnl *** sndio
@ -69,7 +69,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
dnl *** End of all plugin checks ***
AC_SUBST(ARCH_DEFINES)
@@ -1619,6 +1647,7 @@ echo " -> FileWriter MP3 output part: $have_
@@ -1652,6 +1680,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"

10
audio/audacious-plugins/patches/patch-src_aac_libmp4_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_aac_libmp4_c,v 1.6 2010/12/19 18:19:56 shadchin Exp $
--- src/aac/libmp4.c.orig Wed Dec 8 04:14:55 2010
+++ src/aac/libmp4.c Fri Dec 17 23:07:16 2010
@@ -63,7 +63,7 @@ static guint32 mp4_read_callback(void *data, void *buf
$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
@@ -64,7 +64,7 @@ static guint32 mp4_read_callback(void *data, void *buf
return vfs_fread(buffer, 1, len, (VFSFile *) data);
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.6 2010/12/19 18:19:56 shadchin Exp $
{
g_return_val_if_fail (data != NULL, -1);
g_return_val_if_fail (pos <= G_MAXINT64, -1);
@@ -578,7 +578,7 @@ static int my_decode_mp4( InputPlayback *playback, cha
@@ -583,7 +583,7 @@ static int my_decode_mp4( InputPlayback *playback, cha
NeAACDecHandle decoder;
guchar *buffer = NULL;
guint bufferSize = 0;

51
audio/audacious/Makefile
View File

@ -1,22 +1,21 @@
# $OpenBSD: Makefile,v 1.23 2010/12/27 11:50:45 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2011/03/02 14:07:09 shadchin Exp $
SHARED_ONLY = Yes
SHARED_ONLY = Yes
COMMENT = gtk+2 media player based on BMP and XMMS
COMMENT = gtk+2 media player based on BMP and XMMS
DISTNAME = audacious-2.4.2
REVISION = 0
DISTNAME = audacious-2.4.4
SHARED_LIBS = audclient 1.1 # 2.0
SHARED_LIBS = audclient 1.1 # 2.0
CATEGORIES = audio multimedia
CATEGORIES = audio multimedia
HOMEPAGE = http://audacious-media-player.org/
HOMEPAGE = http://audacious-media-player.org/
# GPLv3
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
@ -28,26 +27,26 @@ WANTLIB += m mcs mowgli pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
WANTLIB += z
MASTER_SITES = http://distfiles.atheme.org/
MASTER_SITES = http://distfiles.atheme.org/
EXTRACT_SUFX = .tgz
EXTRACT_SUFX = .tgz
MODULES = devel/gettext
MODULES = devel/gettext
BUILD_DEPENDS = textproc/libxml
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = devel/libexecinfo \
devel/libguess \
devel/mcs>=0.7.0 \
devel/mowgli>=0.4.0 \
x11/dbus-glib \
x11/dbus \
x11/gtk+2
BUILD_DEPENDS = textproc/libxml
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = devel/libexecinfo \
devel/libguess \
devel/mcs>=0.7.0 \
devel/mowgli>=0.4.0 \
x11/dbus-glib \
x11/dbus \
x11/gtk+2
MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION}
MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION}
USE_GROFF = Yes
USE_GMAKE = Yes
USE_GROFF = Yes
USE_GMAKE = Yes
AUTOCONF_VERSION = 2.61

10
audio/audacious/distinfo
View File

@ -1,5 +1,5 @@
MD5 (audacious-2.4.2.tgz) = v/3uFWU1lafpEmJG3uRE5Q==
RMD160 (audacious-2.4.2.tgz) = cmd9yrK8cJijvYwBfQJh4DlP38s=
SHA1 (audacious-2.4.2.tgz) = pYdaUq5HITqQDvHe2P4Ns8vQ78c=
SHA256 (audacious-2.4.2.tgz) = YCwUIXde+PiMDiITnKb2PHYVnnYqwsNsXdL+E6wDrQ0=
SIZE (audacious-2.4.2.tgz) = 1344152
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

22
audio/audacious/patches/patch-src_libaudcore_audstrings_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_libaudcore_audstrings_c,v 1.1 2010/12/19 18:17:55 shadchin Exp $
--- src/libaudcore/audstrings.c.orig Thu Aug 26 05:04:25 2010
+++ src/libaudcore/audstrings.c Sat Dec 4 15:49:51 2010
@@ -230,8 +230,7 @@ uri_to_display_dirname(const gchar * uri)
return dirname;
}
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define HAVE_EXECINFO 1
+#if defined(__GLIBC__) && (__GLIBC__ >= 2) && defined(HAVE_EXECINFO_H)
#include <execinfo.h>
#endif
@@ -258,7 +257,7 @@ str_assert_utf8(const gchar * str)
/* already UTF-8? */
if (!g_utf8_validate(str, -1, NULL)) {
-#ifdef HAVE_EXECINFO
+#ifdef HAVE_EXECINFO_H
gint i, nsymbols;
const gint nsymmax = 50;
void *addrbuf[nsymmax];