UPDATE: audacious-plugins
Some fixes and improvements for the audacious-plugins port..
- sync/re-sort WANTLIBs
- enable GIO support since we have Glib in the dependency path anyway
- simplify one of the Makefile patches a bit
- invert the logic for enabling/disabling the sndio backend
- more appropriate fix for some of the autoconf checks as the LIBS
variable was being polluted very early on breaking most of the
checks using AC_CHECK_LIB as well as remove/fix some improper use
of the AC_CHECK_LIB macro
Index: Makefile
===
RCS file: /home/cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile21 Mar 2012 16:13:25 - 1.41
+++ Makefile4 Apr 2012 23:49:19 -
@@ -6,7 +6,7 @@ COMMENT = input and output plugins for
V =3.2
DISTNAME = audacious-plugins-$V
-REVISION = 0
+REVISION = 1
CATEGORIES = audio multimedia
@@ -18,16 +18,14 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 audcore audgui cairo cairo-gobject
-WANTLIB += expat fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs samplerate xcb
-WANTLIB += xcb-render xcb-shm z ${MODGETTEXT_WANTLIB}
-WANTLIB += FLAC SDL audtag cddb cdio cdio_cdda cue curl
-WANTLIB += dbus-1 dbus-glib-1 faad modplug mp3lame mpg123 neon notify ogg
-WANTLIB += sndfile sndio stdc++ vorbis vorbisenc vorbisfile wavpack xml2
+WANTLIB += FLAC GL SDL X11 Xcomposite Xrender atk-1.0 audcore
+WANTLIB += audgui audtag cairo cairo-gobject cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 expat faad fontconfig freetype
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB += m modplug mp3lame mpg123 neon notify ogg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs
+WANTLIB += samplerate sndfile sndio stdc++ vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xcb xcb-render xcb-shm xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -62,8 +60,8 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.68
-CONFIGURE_ARGS += --enable-ipv6 \
- --enable-sndio \
+CONFIGURE_ARGS += --enable-gio \
+ --enable-ipv6 \
--disable-pulse \
--disable-adplug \
--disable-sid \
@@ -75,7 +73,6 @@ CONFIGURE_ARGS += --enable-ipv6 \
--disable-ffaudio \
--disable-jack \
--disable-bs2b
-
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
Index: patches/patch-configure_ac
===
RCS file: /home/cvs/ports/audio/audacious-plugins/patches/patch-configure_ac,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure_ac
--- patches/patch-configure_ac 21 Mar 2012 16:13:25 - 1.10
+++ patches/patch-configure_ac 2 Apr 2012 22:11:09 -
@@ -1,7 +1,17 @@
$OpenBSD: patch-configure_ac,v 1.10 2012/03/21 16:13:25 dcoppa Exp $
configure.ac.orig Fri Jan 20 20:48:30 2012
-+++ configure.ac Wed Mar 21 12:36:48 2012
-@@ -95,7 +95,7 @@ dnl ===
+--- configure.ac.orig Fri Jan 20 14:48:30 2012
configure.ac Mon Apr 2 18:11:01 2012
+@@ -41,9 +41,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
+ [AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious
yet?])]
+ )
+
+-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+-LIBS="$LIBS $AUDACIOUS_LIBS"
+-
+ dnl Default Set of Plugins
+ dnl ==
+
+@@ -95,7 +92,7 @@ dnl ===
PTHREAD_LIBS=
PTHREAD_CFLAGS=
@@ -10,43 +20,25 @@ $OpenBSD: patch-configure_ac,v 1.10 2012
[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS="-lpthreads",
[AC_CHECK_LIB(pthreadGC2, pthread_create, PTHREAD_LIBS="-lpthreadGC2")]
)]
-@@ -490,7 +490,7 @@ if test x$enable_aac = xyes; then
- AC_CHECK_DECL(NeAACDecInit2,,enable_aac=no,[#include
])
- fi
- if test x$enable_aac = xyes; then
-- AC_CHECK_LIB(faad,NeAACDecInit2,enable_aac=yes,enable_aac=no)
-+ AC_CHECK_LIB(faad -lGL -lXau -lXdmcp -lXxf86vm -ldrm -lxcb
-pthread,NeAACDecInit2,enable_aac=yes,enable_aac=no)
- fi
- fi
-
-@@ -862,7 +862,7 @@ AC_ARG_ENABLE(neon,
-
- if test "x$have_neon" = "xyes"; then
- PKG_CHECK_MODULES(NEON, [neon >= 0.26],
[TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon" ], [have_neon="no"])
--AC_CHECK_LIB([neon],
[update] audacious+plugins 3.3.3
Hi! A bugfixing update to 3.3.3. Ciao, David Index: audacious/Makefile === RCS file: /cvs/ports/audio/audacious/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- audacious/Makefile 21 Dec 2012 12:13:35 - 1.40 +++ audacious/Makefile 27 Dec 2012 10:37:14 - @@ -4,8 +4,7 @@ SHARED_ONLY = Yes COMMENT = Gtk+3 media player based on BMP and XMMS -DISTNAME = audacious-3.3.2 -REVISION = 0 +DISTNAME = audacious-3.3.3 SHARED_LIBS = audclient 3.0 # 2.0 SHARED_LIBS += audcore 2.0 # 1.0 Index: audacious/distinfo === RCS file: /cvs/ports/audio/audacious/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- audacious/distinfo 1 Oct 2012 07:56:11 - 1.15 +++ audacious/distinfo 27 Dec 2012 10:37:14 - @@ -1,2 +1,2 @@ -SHA256 (audacious-3.3.2.tar.bz2) = 7hLgjSSGzEM8mQbziEQzMd1vWG9ju19q19V6iYrztwQ= -SIZE (audacious-3.3.2.tar.bz2) = 466951 +SHA256 (audacious-3.3.3.tar.bz2) = vaEHTJgoRHG43tHKpfZAzd5uhyP6iz9P1oXelyKPfJQ= +SIZE (audacious-3.3.3.tar.bz2) = 470286 Index: audacious/pkg/PLIST === RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- audacious/pkg/PLIST 25 Aug 2012 11:30:19 - 1.15 +++ audacious/pkg/PLIST 27 Dec 2012 10:37:14 - @@ -90,6 +90,7 @@ share/locale/id_ID/LC_MESSAGES/audacious share/locale/it/LC_MESSAGES/audacious.mo share/locale/ja/LC_MESSAGES/audacious.mo share/locale/ko/LC_MESSAGES/audacious.mo +share/locale/ky/LC_MESSAGES/audacious.mo share/locale/lt/LC_MESSAGES/audacious.mo share/locale/lv/LC_MESSAGES/audacious.mo share/locale/nl/LC_MESSAGES/audacious.mo Index: audacious-plugins/Makefile === RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v retrieving revision 1.54 diff -u -p -r1.54 Makefile --- audacious-plugins/Makefile 21 Dec 2012 12:13:35 - 1.54 +++ audacious-plugins/Makefile 27 Dec 2012 10:37:14 - @@ -4,8 +4,7 @@ SHARED_ONLY = Yes COMMENT = input and output plugins for Audacious -V =3.3.2 -REVISION = 0 +V =3.3.3 DISTNAME = audacious-plugins-$V Index: audacious-plugins/distinfo === RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- audacious-plugins/distinfo 1 Oct 2012 07:56:40 - 1.16 +++ audacious-plugins/distinfo 27 Dec 2012 10:37:14 - @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-3.3.2.tar.bz2) = 8cPC5dp6GqXmrCRvRuvat3ZghHjaZkZKWkMMKp+e/aw= -SIZE (audacious-plugins-3.3.2.tar.bz2) = 1687043 +SHA256 (audacious-plugins-3.3.3.tar.bz2) = OQanAJDtsJuUUE+jfII2NbdStAjhKfwBVihtQJ01D48= +SIZE (audacious-plugins-3.3.3.tar.bz2) = 1740185 Index: audacious-plugins/pkg/PLIST === RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- audacious-plugins/pkg/PLIST 1 Oct 2012 07:56:40 - 1.6 +++ audacious-plugins/pkg/PLIST 27 Dec 2012 10:37:14 - @@ -197,6 +197,7 @@ share/locale/be/LC_MESSAGES/audacious-pl share/locale/ca/LC_MESSAGES/audacious-plugins.mo share/locale/cs/LC_MESSAGES/audacious-plugins.mo share/locale/de/LC_MESSAGES/audacious-plugins.mo +share/locale/el/LC_MESSAGES/audacious-plugins.mo share/locale/es/LC_MESSAGES/audacious-plugins.mo share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo @@ -205,9 +206,11 @@ share/locale/eu/LC_MESSAGES/audacious-pl share/locale/fr/LC_MESSAGES/audacious-plugins.mo share/locale/gl/LC_MESSAGES/audacious-plugins.mo share/locale/hu/LC_MESSAGES/audacious-plugins.mo +share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo share/locale/it/LC_MESSAGES/audacious-plugins.mo share/locale/ja/LC_MESSAGES/audacious-plugins.mo share/locale/ko/LC_MESSAGES/audacious-plugins.mo +share/locale/ky/LC_MESSAGES/audacious-plugins.mo share/locale/lt/LC_MESSAGES/audacious-plugins.mo share/locale/lv/LC_MESSAGES/audacious-plugins.mo share/locale/pl/LC_MESSAGES/audacious-plugins.mo
update: audacious + plugins 1.5.0
Hi,
The diffs below updates audacious and audacious-plugins to 1.5.0.
There are 2 extra diffs (already submitted) that fix the sun output
plugin and some crash. arts compiles but it's untested.
Comments, suggestions and OKs welcome.
f.-
Index: audio/audacious/Makefile
===
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- audio/audacious/Makefile15 Dec 2007 18:56:35 - 1.7
+++ audio/audacious/Makefile31 Mar 2008 01:10:45 -
@@ -2,12 +2,12 @@
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-1.3.2
-PKGNAME= ${DISTNAME}p1
-SHARED_LIBS= audacious 5.0
-CATEGORIES=audio
+DISTNAME= audacious-1.5.0
+SHARED_LIBS= audclient 0.0
+
+CATEGORIES=audio multimedia
HOMEPAGE= http://audacious-media-player.org/
@@ -17,26 +17,34 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
-MASTER_SITES= http://static.audacious-media-player.org/release/
-EXTRACT_SUFX= .tgz
+WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+ fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
+ gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+ png pthread z
-USE_X11= Yes
-NO_REGRESS=Yes
+MASTER_SITES= http://distfiles.atheme.org/
-MODULES= devel/gettext
+EXTRACT_SUFX= .tgz
-WANTLIB= X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage expat fontconfig freetype m z c pthread \
- glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 gdk_pixbuf-2.0 \
- gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png \
- pango-1.0 pangocairo-1.0 pangoft2-1.0 stdc++ xml2
+MODULES= devel/gettext
+BUILD_DEPENDS= :libxml-*:textproc/libxml
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS= glade-2.0.>=0.3::devel/libglade2 \
- mcs::devel/mcs
+LIB_DEPENDS= mcs::devel/mcs \
+ mowgli::devel/mowgli \
+ dbus-glib-1::x11/dbus-glib \
+dbus-1.>=6::x11/dbus \
+ gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+
+MAKE_ENV= LIBaudclient_VERSION=${LIBaudclient_VERSION}
-MAKE_ENV= LIBaudacious_VERSION=${LIBaudacious_VERSION}
+USE_X11= Yes
+USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.61
+CONFIGURE_STYLE= autoconf
+
+NO_REGRESS=Yes
.include
Index: audio/audacious/distinfo
===
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- audio/audacious/distinfo21 May 2007 11:30:26 - 1.3
+++ audio/audacious/distinfo31 Mar 2008 01:10:45 -
@@ -1,5 +1,5 @@
-MD5 (audacious-1.3.2.tgz) = t4SjBgSi+dhOnaMQBp9D+Q==
-RMD160 (audacious-1.3.2.tgz) = +PqTPdlZzgIEe9J7Aam4vGyrCLg=
-SHA1 (audacious-1.3.2.tgz) = j8WRLNijrJi5Xm+5zSwjfPanjOg=
-SHA256 (audacious-1.3.2.tgz) = zMihkNbptfYDuuVfxkLdsm+rKFtednBFkrfpXYL+7u8=
-SIZE (audacious-1.3.2.tgz) = 1730554
+MD5 (audacious-1.5.0.tgz) = 6mMbaetU6X1gvzxSrmx+Yg==
+RMD160 (audacious-1.5.0.tgz) = vB//JHHuH45+2E9K7QYLVyQJhT8=
+SHA1 (audacious-1.5.0.tgz) = Ng9ppjgjSTYglTWhYQVRs9ChEiY=
+SHA256 (audacious-1.5.0.tgz) = JaTnLKRMIii0EkbfZirmqWt+vNVhr/rNwN2D697gIyI=
+SIZE (audacious-1.5.0.tgz) = 1946403
Index: audio/audacious/patches/patch-buildsys_mk_in
===
RCS file: audio/audacious/patches/patch-buildsys_mk_in
diff -N audio/audacious/patches/patch-buildsys_mk_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/audacious/patches/patch-buildsys_mk_in31 Mar 2008 01:10:45
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- buildsys.mk.in.origThu Mar 13 22:19:27 2008
buildsys.mk.in Sun Mar 23 05:55:30 2008
+@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
+ OBJS += ${OBJS5:.m=.o}
+ DEPS += ${OBJS:.o=.dep}
+
+-.SILENT:
++#.SILENT:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall
uninstall-extra clean distclean
+
Index: audio/audacious/patches/patch-m4_buildsys_m4
===
RCS file: audio/audacious/patches/patch-m4_buildsys_m4
diff -N audio/audacious/patches/patch-m4_buildsys_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/audacious/patches/patch-m4_buildsys_m431 Mar 2008 01:10:45
-
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- m4/buildsys.m4.origThu Mar 13 22:19:27 2008
m4/buildsys.m4 Sun Mar 23 06:10:48 2008
+@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+
Re: UPDATE: audacious-plugins
On Thu, Apr 5, 2012 at 8:53 PM, Brad Smith wrote: > Some fixes and improvements for the audacious-plugins port.. > > - sync/re-sort WANTLIBs > - enable GIO support since we have Glib in the dependency path anyway > - simplify one of the Makefile patches a bit > - invert the logic for enabling/disabling the sndio backend > - more appropriate fix for some of the autoconf checks as the LIBS > variable was being polluted very early on breaking most of the > checks using AC_CHECK_LIB as well as remove/fix some improper use > of the AC_CHECK_LIB macro Taking care of this... thanks, David
[update] audacious-plugins-3.9
Hi,
Here's update to bring audacious-plugins to latest version. Requires update to
audacious port itself I sent earlier.
The diff is a bit off, I couldn't restore updated patch-configure so here's the
updated patch-configure file inline:
$OpenBSD$
Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks.
This fixes some of the autoconf checks as the LIBS variable is being
polluted very early on, breaking most of the checks using AC_CHECK_LIB.
Index: configure
--- configure.orig
+++ configure
@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
fi
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
-LIBS="$LIBS $AUDACIOUS_LIBS"
if test $HAVE_DARWIN = yes ; then
@@ -14657,6 +14655,8 @@ as_fn_error ()
as_fn_exit $as_status
} # as_fn_error
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
# as_fn_set_status STATUS
# ---
And here's the rest of the diff without the above bits.
Timo
Index: Makefile
===
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile26 Jul 2017 22:45:14 - 1.71
+++ Makefile6 Sep 2017 10:26:10 -
@@ -2,8 +2,7 @@
COMMENT = input and output plugins for Audacious
-V =3.5.2
-REVISION = 3
+V =3.9
DISTNAME = audacious-plugins-$V
CATEGORIES = audio multimedia
@@ -13,14 +12,15 @@ HOMEPAGE = http://audacious-media-playe
# BSD / GPL
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += FLAC GL X11 Xcomposite Xrender atk-1.0 audgui audtag
-WANTLIB += avcodec avformat avutil c cairo cairo-gobject cddb
-WANTLIB += cdio cdio_cdda cue curl dbus-1 dbus-glib-1 faad fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-3 m mms modplug mp3lame mpg123 neon
-WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
-WANTLIB += samplerate sndfile sndio soxr ${COMPILER_LIBCXX} vorbis vorbisenc
-WANTLIB += vorbisfile wavpack xml2 z
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
+WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gtk-x11-2.0 m mms modplug mp3lame mpg123
+WANTLIB += neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@@ -52,7 +52,7 @@ LIB_DEPENDS = audio/faad>=2.7 \
net/curl \
net/neon \
textproc/libxml \
- x11/gtk+3 \
+ x11/gtk+2 \
x11/dbus-glib
USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo3 Nov 2014 04:29:05 - 1.22
+++ distinfo6 Sep 2017 10:26:10 -
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.5.2.tar.bz2) =
F5YA1/iuMafZxXhc5vp+CRhNvRJx4K24xXdgQyxqTNk=
-SIZE (audacious-plugins-3.5.2.tar.bz2) = 1734588
+SHA256 (audacious-plugins-3.9.tar.bz2) =
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
+SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
Index: patches/patch-src_psf_psx_hw_c
===
RCS file: patches/patch-src_psf_psx_hw_c
diff -N patches/patch-src_psf_psx_hw_c
--- patches/patch-src_psf_psx_hw_c 9 Dec 2014 20:29:03 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_psf_psx_hw_c,v 1.1 2014/12/09 20:29:03 sthen Exp $
src/psf/psx_hw.c.orig Tue Dec 9 20:10:57 2014
-+++ src/psf/psx_hw.c Tue Dec 9 20:11:17 2014
-@@ -1547,7 +1547,7 @@ void psx_bios_hle(uint32_t pc)
- #if DEBUG_HLE_BIOS
- printf("HLEBIOS: srand(%x)\n", a0);
- #endif
-- srand(a0);
-+ srand_deterministic(a0);
- break;
-
- case 0x33: // malloc
Index: patches/patch-src_psf_psx_hw_cc
===
RCS file: patches/patch-src_psf_psx_hw_cc
diff -N patches/patch-src_psf_psx_hw_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_psf_psx_hw_cc 6 Sep 2017 10:26:10 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+change some srand to srand_deterministic, found by deraadt@
+
Re: [update] audacious+plugins 3.3.3
On Thu, Dec 27, 2012 at 03:53:59AM -0700, David Coppa wrote: > > Hi! > > A bugfixing update to 3.3.3. Works fine here. ok.
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote:
> Hi,
>
> The diffs below updates audacious and audacious-plugins to 1.5.0.
> There are 2 extra diffs (already submitted) that fix the sun output
> plugin and some crash. arts compiles but it's untested.
> Comments, suggestions and OKs welcome.
thanks, I'll take a look at this later. I have patches to add jack
support too.
> f.-
>
> Index: audio/audacious/Makefile
> ===
> RCS file: /cvs/ports/audio/audacious/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- audio/audacious/Makefile 15 Dec 2007 18:56:35 - 1.7
> +++ audio/audacious/Makefile 31 Mar 2008 01:10:45 -
> @@ -2,12 +2,12 @@
>
> 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-1.3.2
> -PKGNAME= ${DISTNAME}p1
> -SHARED_LIBS= audacious 5.0
> -CATEGORIES= audio
> +DISTNAME=audacious-1.5.0
> +SHARED_LIBS= audclient 0.0
> +
> +CATEGORIES= audio multimedia
>
> HOMEPAGE=http://audacious-media-player.org/
>
> @@ -17,26 +17,34 @@ PERMIT_DISTFILES_FTP= Yes
> PERMIT_PACKAGE_CDROM=Yes
> PERMIT_PACKAGE_FTP= Yes
>
> -MASTER_SITES=http://static.audacious-media-player.org/release/
> -EXTRACT_SUFX=.tgz
> +WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
> + Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
> + fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
> + gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
> + png pthread z
>
> -USE_X11= Yes
> -NO_REGRESS= Yes
> +MASTER_SITES=http://distfiles.atheme.org/
>
> -MODULES= devel/gettext
> +EXTRACT_SUFX=.tgz
>
> -WANTLIB= X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
> - Xcomposite Xdamage expat fontconfig freetype m z c pthread \
> - glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 gdk_pixbuf-2.0 \
> - gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png \
> - pango-1.0 pangocairo-1.0 pangoft2-1.0 stdc++ xml2
> +MODULES= devel/gettext
>
> +BUILD_DEPENDS= :libxml-*:textproc/libxml
> RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
> -LIB_DEPENDS= glade-2.0.>=0.3::devel/libglade2 \
> - mcs::devel/mcs
> +LIB_DEPENDS= mcs::devel/mcs \
> + mowgli::devel/mowgli \
> + dbus-glib-1::x11/dbus-glib \
> +dbus-1.>=6::x11/dbus \
> + gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
> +
> +MAKE_ENV=LIBaudclient_VERSION=${LIBaudclient_VERSION}
>
> -MAKE_ENV=LIBaudacious_VERSION=${LIBaudacious_VERSION}
> +USE_X11= Yes
> +USE_GMAKE= Yes
>
> -CONFIGURE_STYLE=gnu
> +AUTOCONF_VERSION=2.61
> +CONFIGURE_STYLE= autoconf
> +
> +NO_REGRESS= Yes
>
> .include
> Index: audio/audacious/distinfo
> ===
> RCS file: /cvs/ports/audio/audacious/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- audio/audacious/distinfo 21 May 2007 11:30:26 - 1.3
> +++ audio/audacious/distinfo 31 Mar 2008 01:10:45 -
> @@ -1,5 +1,5 @@
> -MD5 (audacious-1.3.2.tgz) = t4SjBgSi+dhOnaMQBp9D+Q==
> -RMD160 (audacious-1.3.2.tgz) = +PqTPdlZzgIEe9J7Aam4vGyrCLg=
> -SHA1 (audacious-1.3.2.tgz) = j8WRLNijrJi5Xm+5zSwjfPanjOg=
> -SHA256 (audacious-1.3.2.tgz) = zMihkNbptfYDuuVfxkLdsm+rKFtednBFkrfpXYL+7u8=
> -SIZE (audacious-1.3.2.tgz) = 1730554
> +MD5 (audacious-1.5.0.tgz) = 6mMbaetU6X1gvzxSrmx+Yg==
> +RMD160 (audacious-1.5.0.tgz) = vB//JHHuH45+2E9K7QYLVyQJhT8=
> +SHA1 (audacious-1.5.0.tgz) = Ng9ppjgjSTYglTWhYQVRs9ChEiY=
> +SHA256 (audacious-1.5.0.tgz) = JaTnLKRMIii0EkbfZirmqWt+vNVhr/rNwN2D697gIyI=
> +SIZE (audacious-1.5.0.tgz) = 1946403
> Index: audio/audacious/patches/patch-buildsys_mk_in
> ===
> RCS file: audio/audacious/patches/patch-buildsys_mk_in
> diff -N audio/audacious/patches/patch-buildsys_mk_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ audio/audacious/patches/patch-buildsys_mk_in 31 Mar 2008 01:10:45
> -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- buildsys.mk.in.orig Thu Mar 13 22:19:27 2008
> buildsys.mk.in Sun Mar 23 05:55:30 2008
> +@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
> + OBJS += ${OBJS5:.m=.o}
> + DEPS += ${OBJS:.o=.dep}
> +
> +-.SILENT:
> ++#.SILENT:
> + .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
> + .PHONY: all subdirs pre-depend depend install install-extra uninstall
> uninstall-extra clean distclean
> +
> Index: audio/audacious/patches/patch-m4_buildsys_m4
> ===
> RCS file: audio/audacious/patches/patch-m4_buildsys_m4
> diff -N audio/audacious/patches/patch-m4_
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote: > Hi, > > The diffs below updates audacious and audacious-plugins to 1.5.0. > There are 2 extra diffs (already submitted) that fix the sun output > plugin and some crash. arts compiles but it's untested. > Comments, suggestions and OKs welcome. audacious build dies with an ICE on i386: In file included from noicegen.c:16: SFMT.c: In function `gen_rand32': SFT.c:418: internal compiler error: in push_reload, at reload.c:1315 -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 05:29:17AM +, Jacob Meuser wrote: > On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote: > > Hi, > > > > The diffs below updates audacious and audacious-plugins to 1.5.0. > > There are 2 extra diffs (already submitted) that fix the sun output > > plugin and some crash. arts compiles but it's untested. > > Comments, suggestions and OKs welcome. > > audacious build dies with an ICE on i386: > > In file included from noicegen.c:16: > SFMT.c: In function `gen_rand32': > SFT.c:418: internal compiler error: in push_reload, at reload.c:1315 ^ SFMT.c:418 -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 05:29:17AM +, Jacob Meuser wrote: > On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote: > > Hi, > > > > The diffs below updates audacious and audacious-plugins to 1.5.0. > > There are 2 extra diffs (already submitted) that fix the sun output > > plugin and some crash. arts compiles but it's untested. > > Comments, suggestions and OKs welcome. > > audacious build dies with an ICE on i386: > > In file included from noicegen.c:16: > SFMT.c: In function `gen_rand32': > SFT.c:418: internal compiler error: in push_reload, at reload.c:1315 hmm, if cc -O2 -pipe -Wall ... -msse2 ... noicegen.c ^^ to people working on ports: watch out for these -m flags. they seem to be getting more common. even if they don't break your build, they should be removed, mostly because the i386 packages need to work on all i386 systems we support. also because they may change depending on the system they were built on, and inconsistent packages makes debugging very frustrating. -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote:
> Hi,
>
> The diffs below updates audacious and audacious-plugins to 1.5.0.
> There are 2 extra diffs (already submitted) that fix the sun output
> plugin and some crash. arts compiles but it's untested.
> Comments, suggestions and OKs welcome.
here's an updated diff for audacious, with sse2 disabled on i386,
and libsamplerate enabled.
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile15 Dec 2007 18:56:35 - 1.7
+++ Makefile31 Mar 2008 06:32:03 -
@@ -2,12 +2,12 @@
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-1.3.2
-PKGNAME= ${DISTNAME}p1
-SHARED_LIBS= audacious 5.0
-CATEGORIES=audio
+DISTNAME= audacious-1.5.0
+SHARED_LIBS= audclient 0.0
+
+CATEGORIES=audio multimedia
HOMEPAGE= http://audacious-media-player.org/
@@ -17,26 +17,40 @@
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
-MASTER_SITES= http://static.audacious-media-player.org/release/
-EXTRACT_SUFX= .tgz
+WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+ fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
+ gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+ png pthread z
-USE_X11= Yes
-NO_REGRESS=Yes
+MASTER_SITES= http://distfiles.atheme.org/
-MODULES= devel/gettext
+EXTRACT_SUFX= .tgz
-WANTLIB= X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage expat fontconfig freetype m z c pthread \
- glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 gdk_pixbuf-2.0 \
- gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png \
- pango-1.0 pangocairo-1.0 pangoft2-1.0 stdc++ xml2
+MODULES= devel/gettext
+BUILD_DEPENDS= :libxml-*:textproc/libxml
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS= glade-2.0.>=0.3::devel/libglade2 \
- mcs::devel/mcs
+LIB_DEPENDS= mcs::devel/mcs \
+ mowgli::devel/mowgli \
+ dbus-glib-1::x11/dbus-glib \
+dbus-1.>=6::x11/dbus \
+ gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
+ samplerate::audio/libsamplerate
+
+MAKE_ENV= LIBaudclient_VERSION=${LIBaudclient_VERSION}
-MAKE_ENV= LIBaudacious_VERSION=${LIBaudacious_VERSION}
+USE_X11= Yes
+USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.61
+CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS+=--enable-samplerate
+
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+=--disable-sse2
+.endif
+
+NO_REGRESS=Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/audacious/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo21 May 2007 11:30:26 - 1.3
+++ distinfo31 Mar 2008 06:32:03 -
@@ -1,5 +1,5 @@
-MD5 (audacious-1.3.2.tgz) = t4SjBgSi+dhOnaMQBp9D+Q==
-RMD160 (audacious-1.3.2.tgz) = +PqTPdlZzgIEe9J7Aam4vGyrCLg=
-SHA1 (audacious-1.3.2.tgz) = j8WRLNijrJi5Xm+5zSwjfPanjOg=
-SHA256 (audacious-1.3.2.tgz) = zMihkNbptfYDuuVfxkLdsm+rKFtednBFkrfpXYL+7u8=
-SIZE (audacious-1.3.2.tgz) = 1730554
+MD5 (audacious-1.5.0.tgz) = 6mMbaetU6X1gvzxSrmx+Yg==
+RMD160 (audacious-1.5.0.tgz) = vB//JHHuH45+2E9K7QYLVyQJhT8=
+SHA1 (audacious-1.5.0.tgz) = Ng9ppjgjSTYglTWhYQVRs9ChEiY=
+SHA256 (audacious-1.5.0.tgz) = JaTnLKRMIii0EkbfZirmqWt+vNVhr/rNwN2D697gIyI=
+SIZE (audacious-1.5.0.tgz) = 1946403
Index: patches/patch-buildsys_mk_in
===
RCS file: patches/patch-buildsys_mk_in
diff -N patches/patch-buildsys_mk_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-buildsys_mk_in31 Mar 2008 06:32:03 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- buildsys.mk.in.origThu Mar 13 22:19:27 2008
buildsys.mk.in Sun Mar 23 05:55:30 2008
+@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
+ OBJS += ${OBJS5:.m=.o}
+ DEPS += ${OBJS:.o=.dep}
+
+-.SILENT:
++#.SILENT:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall
uninstall-extra clean distclean
+
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 31 Mar 2008 06:32:03 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- configure.ac.orig Sun Mar 30 23:26:29 2008
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 07:17:59AM +, Jacob Meuser wrote:
> On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote:
> > Hi,
> >
> > The diffs below updates audacious and audacious-plugins to 1.5.0.
> > There are 2 extra diffs (already submitted) that fix the sun output
> > plugin and some crash. arts compiles but it's untested.
> > Comments, suggestions and OKs welcome.
>
> here's an updated diff for audacious, with sse2 disabled on i386,
> and libsamplerate enabled.
and here's the plugins. arts output was broken (needed -lstdc++ -lm),
and I enabled jack output and flac playback.
everything seems to be working, except the ladspa plugins. when
they're enabled, audacious just plays silence.
I tried .wma, .mp3, .pls, .wav and .m4a with varying samplerates/
bitrates on i386 using arts, jack, and audio(4) output.
ok by me
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile24 Mar 2008 06:39:55 - 1.11
+++ Makefile31 Mar 2008 10:03:09 -
@@ -5,10 +5,11 @@
COMMENT-main= input and output plugins for audacious
COMMENT-arts= arts helper and plugin for audacious
-V= 1.3.5
+V= 1.5.0
DISTNAME= audacious-plugins-$V
-PKGNAME-main= ${DISTNAME}p2
-PKGNAME-arts= audacious-arts-$Vp0
+PKGNAME-main= ${DISTNAME}
+PKGNAME-arts= audacious-arts-$V
+
CATEGORIES=audio multimedia
HOMEPAGE= http://audacious-media-player.org/
@@ -19,57 +20,78 @@
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
-MASTER_SITES= http://static.audacious-media-player.org/release/
-EXTRACT_SUFX= .tgz
-
-MULTI_PACKAGES=-main
-
-PSEUDO_FLAVORS=no_arts
-FLAVOR?=
-
-.if ${FLAVOR:Mno_arts}
-CONFIGURE_ARGS+=--disable-arts
-.else
-MULTI_PACKAGES+=-arts
-.endif
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
+ freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv \
+ intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png z stdc++
+WANTLIB-main= ${WANTLIB} dbus-1 dbus-glib-1 mowgli ogg ossaudio \
+ xml2 samplerate
+WANTLIB-arts= ${WANTLIB} c pthread
-USE_X11= Yes
-NO_REGRESS=Yes
+MASTER_SITES= http://distfiles.atheme.org/
-WANTLIB= X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage m z expat fontconfig freetype iconv intl \
- pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0 cairo \
- glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 \
- gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 glitz png
+EXTRACT_SUFX= .tgz
-WANTLIB-main= ${WANTLIB} ossaudio stdc++ ogg xml2
-WANTLIB-arts= ${WANTLIB} Xext c pthread
+MULTI_PACKAGES=-main
BUILD_DEPENDS= ${RUN_DEPENDS-main}
-RUN_DEPENDS-main= :audacious->=1.2:audio/audacious
+RUN_DEPENDS-main= :audacious->=1.4:audio/audacious
RUN_DEPENDS-arts= ::audio/audacious-plugins,-main
-LIB_DEPENDS-main= tag.>=6:taglib->=1.4:audio/taglib \
+LIB_DEPENDS-main= esd.>=2::audio/esound \
faad.>=1,mp4ff::audio/faad \
+ FLAC.>=7::audio/flac \
+ mp3lame::audio/lame \
+ mad::audio/libmad \
+ mpcdec.>=2::audio/libmpcdec \
+ sndfile.>=2::audio/libsndfile \
+ vorbis.>=5,vorbisfile.>=4,vorbisenc::audio/libvorbis \
+ tag.>=6:taglib->=1.4:audio/taglib \
audiofile::devel/libaudiofile \
- curl.>=5::net/curl \
SDL.>=6::devel/sdl \
- vorbis.>=5,vorbisfile.>=4::audio/libvorbis \
- mpcdec.>=2::audio/libmpcdec \
- mad::audio/libmad \
- mp3lame::audio/lame \
- esd.>=2::audio/esound \
- sndfile.>=1::audio/libsndfile
+ curl.>=5::net/curl \
+ neon.>=26::net/neon \
+ jack::audio/jack
LIB_DEPENDS-arts= artsc.>=1::x11/kde/arts3
+USE_X11= Yes
+USE_GMAKE= Yes
+
+PSEUDO_FLAVORS=no_arts
+FLAVOR?=
+
+.if ${FLAVOR:Mno_arts}
+CONFIGURE_ARGS+=--disable-arts
+.else
+MULTI_PACKAGES+=-arts
+.endif
+
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-ipv6 \
--with-dev-dsp=/dev/audio \
- --disable-flac \
- --disable-jack
+ --disable-pulse \
+ --disable-altivec \
+ --disable-lirc \
+
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 06:08:16AM +, Jacob Meuser wrote: > On Mon, Mar 31, 2008 at 05:29:17AM +, Jacob Meuser wrote: > > On Mon, Mar 31, 2008 at 02:31:23AM +0100, Federico G. Schwindt wrote: > > > Hi, > > > > > > The diffs below updates audacious and audacious-plugins to 1.5.0. > > > There are 2 extra diffs (already submitted) that fix the sun output > > > plugin and some crash. arts compiles but it's untested. > > > Comments, suggestions and OKs welcome. > > > > audacious build dies with an ICE on i386: > > > > In file included from noicegen.c:16: > > SFMT.c: In function `gen_rand32': > > SFT.c:418: internal compiler error: in push_reload, at reload.c:1315 > > hmm, > > if cc -O2 -pipe -Wall ... -msse2 ... noicegen.c > ^^ > > to people working on ports: watch out for these -m flags. they seem > to be getting more common. even if they don't break your build, they > should be removed, mostly because the i386 packages need to work on > all i386 systems we support. also because they may change depending > on the system they were built on, and inconsistent packages makes > debugging very frustrating. If you look at audacious-plugins I've already disabled it there. I have missed this one, tho. f.-
Re: update: audacious + plugins 1.5.0
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
"Federico G. Schwindt" <[EMAIL PROTECTED]> wrote:
> Index: audio/audacious/patches/patch-m4_buildsys_m4
> ===
> RCS file: audio/audacious/patches/patch-m4_buildsys_m4
> diff -N audio/audacious/patches/patch-m4_buildsys_m4
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ audio/audacious/patches/patch-m4_buildsys_m4 31 Mar 2008
> 01:10:45 - @@ -0,0 +1,20 @@
> +$OpenBSD$
> +--- m4/buildsys.m4.orig Thu Mar 13 22:19:27 2008
> m4/buildsys.m4 Sun Mar 23 06:10:48 2008
> +@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
> + AC_MSG_RESULT(POSIX)
> + LIB_CPPFLAGS='-DPIC'
> + LIB_CFLAGS='-fPIC'
> +-LIB_LDFLAGS='-shared -fPIC
> -Wl,-soname,${LIB}.${LIB_MAJOR}' ++
> LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}'
> + LIB_PREFIX='lib'
> + LIB_SUFFIX='.so'
> + PLUGIN_CPPFLAGS='-DPIC'
> + PLUGIN_CFLAGS='-fPIC'
> + PLUGIN_LDFLAGS='-shared -fPIC'
> + PLUGIN_SUFFIX='.so'
> +-INSTALL_LIB='${INSTALL} -m 755 $$i
> ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f
> $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}
> && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0
> ${DESTDIR}${libdir}/$$i' ++
> INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
> + UNINSTALL_LIB='rm -f
> ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}
> ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
> + CLEAN_LIB=''
> + ;;
I'm the creator of the build system Audacious uses and I'm very unhappy
with this change. Why do you change the POSIX target when there is an
OpenBSD target? Doesn't the OpenBSD target work? Last time I tested it
on OpenBSD, it worked for me. Please patch the OpenBSD target if it
doesn't work and let me know. Feel free to mail me privately about the
build system.
For the patches on some .c files, you should file bugs so we can look
if we can commit them.
- --
Jonathan
-BEGIN PGP SIGNATURE-
iQIVAwUBR/DuActRg9d5cXHkAQPyxRAAxH/WfVrLZYzSQ5zKQ5tFZwLWpWZE6B4o
wJma0JZoFughNuXXtK9vrf0X/aQptTrz3VY7B98xb0P82ASmGZz8a5DOMNHvukG0
qV25N2BTX/C99eVvAdp50lIWMjsUvlolKR6VQXHar0SG8H6hOZqY6uvPNTCk36G0
3DMpslIllk5+IRDgEnQD3X7TYPwE2zRozVFBL5SuGxYELa2+EKFeaOfBPSPhcYT9
LHkMRv8GqXnfkyb9sRz69HHbQecfrs2IMLYqR7yUXWLPLmWQIrjU6tVAae5/XZ/N
n9/PhuxwycbnjLaKcIsje2hRpEoXS7c3teWmES8+UKa1bj5nCXlkfNrSmrrsYFoV
6lIyeaH10eIFB6zeXB9MkorUSTSGwY8fb21ITEVgoknXAh6cxop5/qebIuKzCfls
BbndqmPQ4eNPln1HNTr34Hs63NOeSY78zXq3jCsKrta445wFge9t5fr8tnWyMNqT
a5GOtcfs1G4MNgyBnFuP09Ez2ubFc7BQ+RUEJyGoORxcnx5cgMazp1RnquTvrphf
Bw2qj7b3jA7sGV+TG586szlMk7kTXkydelCEmgbuU2V0WtmOWzVJkxWuT5Jw5x0a
DHr0TlWSyaPLhUANQwCQI+y9t1afvAYu+zbJNU3FTAIka27jQTl8w4mRcecHEwtl
ZRkQgPQdqEI=
=qjIC
-END PGP SIGNATURE-
Re: update: audacious + plugins 1.5.0
On Mon, Mar 31, 2008 at 03:58:25PM +0200, Jonathan Schleifer wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: RIPEMD160
>
> "Federico G. Schwindt" <[EMAIL PROTECTED]> wrote:
>
> > Index: audio/audacious/patches/patch-m4_buildsys_m4
> > ===
> > RCS file: audio/audacious/patches/patch-m4_buildsys_m4
> > diff -N audio/audacious/patches/patch-m4_buildsys_m4
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ audio/audacious/patches/patch-m4_buildsys_m431 Mar 2008
> > 01:10:45 - @@ -0,0 +1,20 @@
> > +$OpenBSD$
> > +--- m4/buildsys.m4.origThu Mar 13 22:19:27 2008
> > m4/buildsys.m4 Sun Mar 23 06:10:48 2008
> > +@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
> > + AC_MSG_RESULT(POSIX)
> > + LIB_CPPFLAGS='-DPIC'
> > + LIB_CFLAGS='-fPIC'
> > +- LIB_LDFLAGS='-shared -fPIC
> > -Wl,-soname,${LIB}.${LIB_MAJOR}' ++
> > LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}'
> > + LIB_PREFIX='lib'
> > + LIB_SUFFIX='.so'
> > + PLUGIN_CPPFLAGS='-DPIC'
> > + PLUGIN_CFLAGS='-fPIC'
> > + PLUGIN_LDFLAGS='-shared -fPIC'
> > + PLUGIN_SUFFIX='.so'
> > +- INSTALL_LIB='${INSTALL} -m 755 $$i
> > ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f
> > $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}
> > && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0
> > ${DESTDIR}${libdir}/$$i' ++
> > INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
> > + UNINSTALL_LIB='rm -f
> > ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}
> > ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
> > + CLEAN_LIB=''
> > + ;;
>
> I'm the creator of the build system Audacious uses and I'm very unhappy
> with this change. Why do you change the POSIX target when there is an
> OpenBSD target? Doesn't the OpenBSD target work? Last time I tested it
> on OpenBSD, it worked for me. Please patch the OpenBSD target if it
> doesn't work and let me know. Feel free to mail me privately about the
> build system.
This was done for simplicity. The target does not work and it also includes
netbsd and solaris, and that's how it was done before. This is not mean to
be submitted anyways, but if you really want it I will prepare a diff and
send it to you.
> For the patches on some .c files, you should file bugs so we can look
> if we can commit them.
As I said in the email, they're already submitted (one already commited).
Thanks,
f.-
Re: update: audacious + plugins 1.5.0
-BEGIN PGP SIGNED MESSAGE- Hash: RIPEMD160 "Federico G. Schwindt" <[EMAIL PROTECTED]> wrote: > This was done for simplicity. The target does not work and it also > includes netbsd and solaris, and that's how it was done before. This > is not mean to be submitted anyways, but if you really want it I will > prepare a diff and send it to you. Yeah, NetBSD uses the POSIX target because it handles shared libraries different. OpenBSD does shared libraries the sun way. That's why there was a target for Solaris and OpenBSD. I'll give it a look as soon as I fire up my notebook with OpenBSD again. > As I said in the email, they're already submitted (one already > commited). Thanks, Sorry, didn't see that. - -- Jonathan -BEGIN PGP SIGNATURE- iQIVAwUBR/D8m8tRg9d5cXHkAQO3HQ//WwhP47faxEsPLJMXDczSvyR+rYkgksfv 9WUaFc0XWCWU55sKHmbydtXIUuv+bzY47xB5+AsyPm/Uc136Ey4Sn2ekt+hpwdYd 9oTGn9w/uXePHxEut/NNcl/UOC6AiECk+pKAr56ZTa5pOb6Yl1dcQdCBqeP/n1ff Sqt3ZpFFKGgLxsrNNa9wx22aOeYIsvQGRtlHWU+wx/Sj/BOdd51/qIRpElw4tEEs 5m3pnJ/nMRqB/ZjC2TVcbFd06E1rXaoG/S2oiCfRgS807jbSq61M3MMOxvCwVZkr yzVgnRsO9BrqoKbYL0oOQ32V6pkR3k3T+yQ8UU21a+KPTclOkaq87mMFDJMiMRoC OkSS6dW6zdZBa//LiSNiljlyQWdzQsWxqUo/jD21L9M5OBQqMSHcR3j4cSNTN8Zy 6GviIqS+p0RxJuBkW/tMwMDhOSlJuAU9BlfckFcOy8Kf2LqxFCOTenjdRtm4Kh9W Xu/tp+RfpQAD8WjUD8/zFynfZCuTC2UcagboN/625EOco+tbmH9c39FykT1U6O0h n4+MzTPNH7y4caTyImeRImlHMSfd/lCr2imMs03JmTpO0xwTDURKfLui9yMuAmgJ VuEcQHyqfvt3zPLEFpl8UQheLO9Bzp/Vx/2GrBT/PB61s5J1xoV55zA5nkeUT87E Eeg7NHM5fEc= =bic2 -END PGP SIGNATURE-
Re: update: audacious + plugins 1.5.0
> [..]
> > This was done for simplicity. The target does not work and it also
> > includes netbsd and solaris, and that's how it was done before. This
> > is not mean to be submitted anyways, but if you really want it I will
> > prepare a diff and send it to you.
>
> Yeah, NetBSD uses the POSIX target because it handles shared libraries
> different. OpenBSD does shared libraries the sun way. That's why there
> was a target for Solaris and OpenBSD. I'll give it a look as soon as I
> fire up my notebook with OpenBSD again.
I mean mirbsd and solaris. Anyway, diff below, but I'm not sure whether
that should be commited.
> > As I said in the email, they're already submitted (one already
> > commited). Thanks,
>
> Sorry, didn't see that.
Well, there is one of the diffs that was not submitted, but was done by
someone else. i will ask that person to do it.
Anyways, let's move this out from ports and continue privately if you
want.
f.-
--- m4/buildsys.m4.orig Thu Mar 13 22:19:27 2008
+++ m4/buildsys.m4 Mon Mar 31 16:01:43 2008
@@ -72,7 +72,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i
${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib
${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
CLEAN_LIB=''
;;
- *-*-solaris* | *-openbsd-* | *-mirbsd-*)
+ *-*-solaris* | *-mirbsd-*)
AC_MSG_RESULT(Solaris)
LIB_CPPFLAGS='-DPIC'
LIB_CFLAGS='-fPIC'
@@ -85,6 +85,21 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_SUFFIX='.so'
INSTALL_LIB='${INSTALL} -m 755 $$i
${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f
${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR}
${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i
${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+ CLEAN_LIB=''
+ ;;
+ *-openbsd*)
+ AC_MSG_RESULT(Solaris)
+ LIB_CPPFLAGS='-DPIC'
+ LIB_CFLAGS='-fPIC'
+ LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}'
+ LIB_PREFIX='lib'
+ LIB_SUFFIX='.so'
+ PLUGIN_CPPFLAGS='-DPIC'
+ PLUGIN_CFLAGS='-fPIC'
+ PLUGIN_LDFLAGS='-shared -fPIC'
+ PLUGIN_SUFFIX='.so'
+ INSTALL_LIB='${INSTALL} -m 755 $$i
${DESTDIR}${libdir}/$$i'
+ UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i'
CLEAN_LIB=''
;;
*-*-cygwin | *-*-mingw32)
Re: update: audacious + plugins 1.5.0
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
"Federico G. Schwindt" <[EMAIL PROTECTED]> wrote:
> --- m4/buildsys.m4.orig Thu Mar 13 22:19:27 2008
> +++ m4/buildsys.m4Mon Mar 31 16:01:43 2008
> @@ -72,7 +72,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
> UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i
> ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib
> ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
> CLEAN_LIB='' ;;
> - *-*-solaris* | *-openbsd-* | *-mirbsd-*)
> + *-*-solaris* | *-mirbsd-*)
> AC_MSG_RESULT(Solaris)
> LIB_CPPFLAGS='-DPIC'
> LIB_CFLAGS='-fPIC'
> @@ -85,6 +85,21 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
> PLUGIN_SUFFIX='.so'
> INSTALL_LIB='${INSTALL} -m 755 $$i
> ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f
> ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR}
> ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i
> ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
> + CLEAN_LIB=''
> + ;;
> + *-openbsd*)
> + AC_MSG_RESULT(Solaris)
> + LIB_CPPFLAGS='-DPIC'
> + LIB_CFLAGS='-fPIC'
> + LIB_LDFLAGS='-shared -fPIC
> -Wl,-soname,${LIB}'
> + LIB_PREFIX='lib'
> + LIB_SUFFIX='.so'
> + PLUGIN_CPPFLAGS='-DPIC'
> + PLUGIN_CFLAGS='-fPIC'
> + PLUGIN_LDFLAGS='-shared -fPIC'
> + PLUGIN_SUFFIX='.so'
> + INSTALL_LIB='${INSTALL} -m 755 $$i
> ${DESTDIR}${libdir}/$$i'
> + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i'
> CLEAN_LIB=''
> ;;
> *-*-cygwin | *-*-mingw32)
Are you sure that patch doesn't break it?
As far as I know, libraries on OpenBSD need to have a name in the form
lib$name.so.$major.$minor and a symlink lib$name.so ->
lib$name.so.$major.$minor. The sun target there does that, but your
OpenBSD target only created lib$name.so if I see it correctly (sorry,
I'm pretty tired atm).
- --
Jonathan
-BEGIN PGP SIGNATURE-
iQIVAwUBR/EAlstRg9d5cXHkAQOdQRAAgqWYnGCBjgITBn4/eFi+oFZYN9Dfb7It
EbV1AjR+lJQVx2Y6VYoRjLq7NrfsaT2kIVhhu8izkEfiLKx17r1mWbMXfFPbg7Fj
zb6Uy0q2LwMW0V4/w2necq6AjX2JQx5HA0ryjN6JVFSRQgxyREPTeGVzaCA7xuo4
Vb2vAksyLV5XhvV2FCKMI2x/RuyhgevFeCi8UoxWxLbovf0xiq6fInj8I9siow8k
mNjYFsayjMuR2rqjy26tE+PCN6ih+qCh6MKfEpES8BghR8So3+ST0kAZRoezb3K+
4S+k9IsJoQRwBraQ7Hd06CVEUVF1+SYTL1liFua48dg0SKSoWFwYLdzDwx7s2Omm
8gO6E38JyzDlTy3b7NztTTsH6h+H+62tb5UeuCL5FC8dXWMd7A89D16L3vVhjNFu
obta4yxCNIEj/nH0C7b8ij/wNNtjOZipNSvzdI6Kgsrt/u3om5LJlBJsse1Pywpi
sjAT4BL46j+gQHk+KpuhFr215wZVO24urHhIACBR9xuR19KIONgptNR1uCpBVqov
8P0E7kbYpAGB1bWycse1upAqADhHRhKJH59slEyGGrM/AR84pOfZ0lrpZlM3hHa/
WaZYssMuDhWj/YWFMhDsax0o3gonNgfahMoOS0aqJGrkqD7feEVImF5bKbXEGyMs
e+E9m5uGpAA=
=07tj
-END PGP SIGNATURE-
Re: update: audacious + plugins 1.5.0
> [..] > Are you sure that patch doesn't break it? > As far as I know, libraries on OpenBSD need to have a name in the form > lib$name.so.$major.$minor and a symlink lib$name.so -> > lib$name.so.$major.$minor. The sun target there does that, but your > OpenBSD target only created lib$name.so if I see it correctly (sorry, > I'm pretty tired atm). i've replied privately. please let's continue without spamming the list. thanks, f.-
