Update zinf to 2.2.5 - Release of zinf 2.2.5 for gtk2.X.
This commit is contained in:
Rui-Xiang Guo
Thomas Klausner
parent
ac8c9e1fa6
commit
ec1804528d
13 changed files with 266 additions and 308 deletions
10
zinf/MESSAGE
Normal file
10
zinf/MESSAGE
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE,v 1.1 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
Be sure to
|
||||
setenv XLIB_SKIP_ARGB_VISUALS 1
|
||||
or
|
||||
export XLIB_SKIP_ARGB_VISUALS=1
|
||||
before run it.
|
||||
|
||||
===========================================================================
|
||||
|
|
@ -1,38 +1,52 @@
|
|||
# $NetBSD: Makefile,v 1.14 2010/06/13 22:47:22 thomasklausner Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2010/11/10 05:33:54 rxg Exp $
|
||||
#
|
||||
|
||||
DISTNAME= zinf-2.2.0
|
||||
PKGREVISION= 2
|
||||
DISTNAME= zinf-2.2.5
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zinf/}
|
||||
|
||||
MAINTAINER= rxg@NetBSD.org
|
||||
HOMEPAGE= http://www.zinf.org/
|
||||
COMMENT= Simple but powerful audio player
|
||||
LICENSE= gnu-gpl-v2
|
||||
|
||||
#BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gmake
|
||||
#USE_PERL5= yes
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= gmake perl pkg-config
|
||||
|
||||
CONFIGURE_ARGS+=--enable-cmdline \
|
||||
--disable-alsa \
|
||||
--disable-arts \
|
||||
--disable-x86opts \
|
||||
# --enable-mutex-debug
|
||||
LIBTOOL_OVERRIDE= libtool
|
||||
|
||||
.include "../../audio/musicbrainz/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-cmdline \
|
||||
--enable-ipv6 \
|
||||
--enable-corba \
|
||||
--enable-xosd
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
.if ${OPSYS} == "Linux"
|
||||
CONFIGURE_ARGS+= --enable-mp3prof
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
|
||||
CONFIGURE_ARGS+= --disable-x86opts
|
||||
.endif
|
||||
|
||||
PRIVILEGED_STAGES+= clean
|
||||
|
||||
.include "../../audio/alsa-lib/buildlink3.mk"
|
||||
.include "../../audio/arts/buildlink3.mk"
|
||||
.include "../../audio/esound/buildlink3.mk"
|
||||
.include "../../audio/id3lib/buildlink3.mk"
|
||||
.include "../../audio/libvorbis/buildlink3.mk"
|
||||
.include "../../audio/musicbrainz/buildlink3.mk"
|
||||
.include "../../databases/gdbm/buildlink3.mk"
|
||||
.include "../../devel/ncurses/buildlink3.mk"
|
||||
.include "../../graphics/freetype-lib/buildlink3.mk"
|
||||
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
|
||||
.include "../../net/ORBit/buildlink3.mk"
|
||||
.include "../../x11/gtk/buildlink3.mk"
|
||||
.include "../../net/ORBit2/buildlink3.mk"
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
.include "../../x11/xosd/buildlink3.mk"
|
||||
.include "../../mk/oss.buildlink3.mk"
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
.include "../../mk/x11.buildlink3.mk"
|
||||
|
|
|
|||
53
zinf/PLIST
53
zinf/PLIST
|
|
@ -1,38 +1,67 @@
|
|||
@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:50:44 thomasklausner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.4 2010/11/10 05:33:54 rxg Exp $
|
||||
bin/zinf
|
||||
lib/zinf/plugins/albumart-ui.a
|
||||
lib/zinf/plugins/albumart.ui
|
||||
lib/zinf/plugins/arts-pmo.a
|
||||
lib/zinf/plugins/arts.pmo
|
||||
lib/zinf/plugins/cd-lmc.a
|
||||
lib/zinf/plugins/cd-pmo.a
|
||||
lib/zinf/plugins/cd.lmc
|
||||
lib/zinf/plugins/cd.pmo
|
||||
lib/zinf/plugins/cmdline-ui.a
|
||||
lib/zinf/plugins/cmdline.ui
|
||||
lib/zinf/plugins/corba-ui.a
|
||||
lib/zinf/plugins/corba.ui
|
||||
lib/zinf/plugins/download-ui.a
|
||||
lib/zinf/plugins/download.ui
|
||||
lib/zinf/plugins/esound-pmo.a
|
||||
lib/zinf/plugins/esound.pmo
|
||||
lib/zinf/plugins/httpinput.pmi
|
||||
lib/zinf/plugins/id3v1.mdf
|
||||
lib/zinf/plugins/id3v2.mdf
|
||||
lib/zinf/plugins/http-pmi.a
|
||||
lib/zinf/plugins/http.pmi
|
||||
lib/zinf/plugins/id3lib-mdf.a
|
||||
lib/zinf/plugins/id3lib.mdf
|
||||
lib/zinf/plugins/irman-ui.a
|
||||
lib/zinf/plugins/irman.ui
|
||||
lib/zinf/plugins/kjofol-ftf.a
|
||||
lib/zinf/plugins/kjofol.ftf
|
||||
lib/zinf/plugins/lcd-ui.a
|
||||
lib/zinf/plugins/lcd.ui
|
||||
lib/zinf/plugins/localfileinput.pmi
|
||||
lib/zinf/plugins/local-pmi.a
|
||||
lib/zinf/plugins/local.pmi
|
||||
lib/zinf/plugins/m3u-plf.a
|
||||
lib/zinf/plugins/m3u.plf
|
||||
lib/zinf/plugins/mbcd-mdf.a
|
||||
lib/zinf/plugins/mbcd.mdf
|
||||
lib/zinf/plugins/misc-mdf.a
|
||||
lib/zinf/plugins/misc.mdf
|
||||
lib/zinf/plugins/mpg123-ui.a
|
||||
lib/zinf/plugins/mpg123.ui
|
||||
lib/zinf/plugins/musicbrowser-ui.a
|
||||
lib/zinf/plugins/musicbrowser.ui
|
||||
lib/zinf/plugins/ncurses-ui.a
|
||||
lib/zinf/plugins/ncurses.ui
|
||||
lib/zinf/plugins/obsinput.pmi
|
||||
lib/zinf/plugins/obs-pmi.a
|
||||
lib/zinf/plugins/obs.pmi
|
||||
lib/zinf/plugins/pls-plf.a
|
||||
lib/zinf/plugins/pls.plf
|
||||
lib/zinf/plugins/rmp.dlf
|
||||
lib/zinf/plugins/soundcard.pmo
|
||||
lib/zinf/plugins/vorbis-lmc.a
|
||||
lib/zinf/plugins/vorbis-mdf.a
|
||||
lib/zinf/plugins/vorbis.lmc
|
||||
lib/zinf/plugins/vorbis.mdf
|
||||
lib/zinf/plugins/wav-lmc.a
|
||||
lib/zinf/plugins/wav.lmc
|
||||
lib/zinf/plugins/wavout-pmo.a
|
||||
lib/zinf/plugins/wavout.pmo
|
||||
lib/zinf/plugins/winamp-ftf.a
|
||||
lib/zinf/plugins/winamp.ftf
|
||||
lib/zinf/plugins/winamp_theme.xml
|
||||
lib/zinf/plugins/xingmp3-lmc.a
|
||||
lib/zinf/plugins/xingmp3.lmc
|
||||
lib/zinf/plugins/xosd-ui.a
|
||||
lib/zinf/plugins/xosd.ui
|
||||
lib/zinf/plugins/zinf-ui.a
|
||||
lib/zinf/plugins/zinf.ui
|
||||
lib/zinf/plugins/zinfcmd.ui
|
||||
share/gnome/apps/Audio/Zinf.desktop
|
||||
share/pixmaps/zinf.png
|
||||
share/locale/ca_ES/LC_MESSAGES/zinf.mo
|
||||
share/locale/ru/LC_MESSAGES/zinf.mo
|
||||
share/zinf/themes/Aquatica.fat
|
||||
share/zinf/themes/Zinf.fat
|
||||
share/zinf/themes/ZinfClassic.fat
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
$NetBSD: distinfo,v 1.2 2005/09/28 06:41:44 rillig Exp $
|
||||
$NetBSD: distinfo,v 1.3 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
SHA1 (zinf-2.2.0.tar.gz) = 614da273c35df3b0f2dcf1aeb1eeeeded64d894d
|
||||
RMD160 (zinf-2.2.0.tar.gz) = 44894f70184b4ff0379da80e1009d1d30769ee7b
|
||||
Size (zinf-2.2.0.tar.gz) = 2163858 bytes
|
||||
SHA1 (patch-aa) = 1e2d128acb7cdc0d35afb26b9c783d12dc370276
|
||||
SHA1 (patch-ab) = bccf2dbbc80bfb018332d02dd8ad5773ea7b6342
|
||||
SHA1 (patch-ac) = 907dc9741076347f6b1044f61c32c334da2385a3
|
||||
SHA1 (patch-ad) = 71551875dd16408ce7e3dec7ea96ce3cb1c84b9e
|
||||
SHA1 (patch-ae) = 009faa1d5c157639ba63209156f3394a38c927a2
|
||||
SHA1 (patch-af) = 561808becab8c7a301c887faf5e788a76a47bbcd
|
||||
SHA1 (patch-ag) = 6bf5cb1c9c34acb948369a3785128c79d9994910
|
||||
SHA1 (patch-ah) = 5abe04ab3a1df5d5973843cf75f13baf8e7200b5
|
||||
SHA1 (patch-ai) = 4c85e5a1bf2f053e8f7a04940a91db36e7952493
|
||||
SHA1 (zinf-2.2.5.tar.gz) = 5ef056e476fa3bfedcb2d0f7de7859b97a22ca6b
|
||||
RMD160 (zinf-2.2.5.tar.gz) = 589a31fdac0d9a641bf26fbd94f7aaca05e0efdc
|
||||
Size (zinf-2.2.5.tar.gz) = 2044561 bytes
|
||||
SHA1 (patch-aa) = 6eedeb783fdd74f3133074f66d87c1e7d2eae1ea
|
||||
SHA1 (patch-ab) = beb2d2f9a58fb0355caf95812e94127c74221596
|
||||
SHA1 (patch-ac) = cd9f75123d6279e36be109f37d85a4f31e9a1a7f
|
||||
SHA1 (patch-ad) = e8e884395d5916c7ed7d2105ecd386255750f951
|
||||
SHA1 (patch-ae) = 7adeb2eaab7751e4d3971bca2014b1a2002ade55
|
||||
SHA1 (patch-af) = dc554d7d6e5bdef535439c85c22f7a6764ed76ca
|
||||
SHA1 (patch-ag) = 83c70c87a962c8d39559979265828117e719eecf
|
||||
|
|
|
|||
|
|
@ -1,47 +1,105 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2003/07/06 19:52:54 rxg Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- configure.in.orig Mon Jul 1 20:06:47 2002
|
||||
+++ configure.in
|
||||
@@ -176,9 +176,9 @@
|
||||
LDFLAGS="$LDFLAGS -Wl,-export-dynamic -L/usr/local/lib"
|
||||
;;
|
||||
netbsd*)
|
||||
- host_os="freebsd"
|
||||
- CFLAGS="$CFLAGS -I/usr/pkg/include -D_THREAD_SAFE -pthread"
|
||||
- LDFLAGS="$LDFLAGS -L/usr/pkg/lib -Wl,-export-dynamic"
|
||||
+ host_os="netbsd"
|
||||
+ CFLAGS="$CFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
|
||||
;;
|
||||
irix*)
|
||||
host_os="irix"
|
||||
@@ -232,7 +232,7 @@
|
||||
--- configure.orig 2004-02-17 22:09:31.000000000 +0000
|
||||
+++ configure
|
||||
@@ -24265,6 +24265,7 @@ _ACEOF
|
||||
|
||||
if test "$host_os" = "beos"; then
|
||||
AC_MSG_WARN([skipping libdl check, using BeOS add-on mechanism])
|
||||
-elif test "$host_os" = "freebsd"; then
|
||||
+elif test "$host_os" = "freebsd" -o "$host_os" = "netbsd"; then
|
||||
AC_CHECK_LIB(c, dlopen, foo="bar",
|
||||
AC_MSG_ERROR([FreeAmp requires the ability to load libraries dynamically (using dlopen)])
|
||||
)
|
||||
@@ -615,11 +615,9 @@
|
||||
#AM_CONDITIONAL(AM_ENABLE_CMDLINE, test "$cmdline" = "true")
|
||||
os_cflags="--D_THREAD_SAFE -pthread -I/usr/local/include";
|
||||
os_ldflags="-Wl,-export-dynamic -L/usr/local/lib";
|
||||
+ DEFS=-D_BSD_SOURCE;
|
||||
;;
|
||||
netbsd*)
|
||||
ZINF_OS="freebsd";
|
||||
@@ -24275,6 +24276,7 @@ _ACEOF
|
||||
|
||||
os_cflags="-I/usr/pkg/include -D_THREAD_SAFE -pthread";
|
||||
os_ldflags=" -L/usr/pkg/lib -Wl,-export-dynamic";
|
||||
+ DEFS=-D_BSD_SOURCE;
|
||||
;;
|
||||
irix*)
|
||||
ZINF_OS="irix"
|
||||
@@ -25193,7 +25195,7 @@ echo $ECHO_N "checking for pthread_mutex
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
|
||||
-AC_CHECK_LIB(ncurses,initscr,curses="ncurses", [
|
||||
AC_CHECK_LIB(curses,initscr,curses="curses", [
|
||||
echo "curses/ncurses not found. disabling curses UI."
|
||||
])
|
||||
-])
|
||||
if test x$pthread_xtra_defs = x ; then
|
||||
- CFLAGS="$CFLAGS -D__USE_UNIX98 -D_XOPEN_SOURCE=500"
|
||||
+ CFLAGS="$CFLAGS -D__USE_UNIX98"
|
||||
pthread_xtra_defs="yes"
|
||||
fi
|
||||
|
||||
if test "$curses" != ""; then
|
||||
OSDEPPLUGINS="$OSDEPPLUGINS plugins/ncurses.ui";
|
||||
@@ -938,7 +936,7 @@
|
||||
echo "*** Download the library from "
|
||||
echo "*** http://www.musicbrainz.org/download.html"
|
||||
echo "***"
|
||||
- AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
|
||||
+ AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
|
||||
AC_LANG_RESTORE
|
||||
@@ -26384,10 +26386,10 @@ experimental="false"
|
||||
# Check whether --enable-experimental or --disable-experimental was given.
|
||||
if test "${enable_experimental+set}" = set; then
|
||||
enableval="$enable_experimental"
|
||||
- if test "x$enableval" == "xyes"; then experimental="true"; fi
|
||||
+ if test "x$enableval" = "xyes"; then experimental="true"; fi
|
||||
fi;
|
||||
|
||||
AC_CONFIG_HEADER(config/config.h)
|
||||
-if test "x$experimental" == "xtrue" ; then
|
||||
+if test "x$experimental" = "xtrue" ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define EXPERIMENTAL 1
|
||||
@@ -29340,7 +29342,7 @@ fi;
|
||||
fi
|
||||
|
||||
# Extract the first word of "orbit-config", so it can be a program name with args.
|
||||
-set dummy orbit-config; ac_word=$2
|
||||
+set dummy orbit2-config; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then
|
||||
@@ -29389,7 +29391,7 @@ echo $ECHO_N "checking for ORBit - versi
|
||||
ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
|
||||
ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
|
||||
orbit_config_major_version=`$ORBIT_CONFIG $orbit_config_args --version | \
|
||||
- sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
+ sed -e 's,ORBit2 ,,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
orbit_config_minor_version=`$ORBIT_CONFIG $orbit_config_args --version | \
|
||||
sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
orbit_config_micro_version=`$ORBIT_CONFIG $orbit_config_args --version | \
|
||||
@@ -29410,7 +29412,7 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
-#include <orb/orbit.h>
|
||||
+#include <orbit/orbit.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -29537,7 +29539,7 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
-#include <orb/orbit.h>
|
||||
+#include <orbit/orbit.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int
|
||||
@@ -29604,7 +29606,7 @@ rm -f conftest.err conftest.$ac_objext \
|
||||
fi
|
||||
|
||||
# Extract the first word of "orbit-idl", so it can be a program name with args.
|
||||
-set dummy orbit-idl; ac_word=$2
|
||||
+set dummy orbit-idl-2; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_ORBIT_IDL+set}" = set; then
|
||||
@@ -29749,7 +29751,7 @@ else
|
||||
enable_xosd_ui=no
|
||||
fi;
|
||||
|
||||
-if test "$enable_xosd_ui" == "yes"; then
|
||||
+if test "$enable_xosd_ui" = "yes"; then
|
||||
UI_PLUGINS="$UI_PLUGINS xosd"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: Not building the XOSD plugin" >&5
|
||||
@@ -29861,7 +29863,7 @@ s/^[^=]*=[ ]*$//;
|
||||
}'
|
||||
fi
|
||||
|
||||
-DEFS=-DHAVE_CONFIG_H
|
||||
+DEFS="-DHAVE_CONFIG_H $DEFS"
|
||||
|
||||
ac_libobjs=
|
||||
ac_ltlibobjs=
|
||||
|
|
|
|||
|
|
@ -1,97 +1,17 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2003/07/06 19:52:55 rxg Exp $
|
||||
$NetBSD: patch-ab,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- configure.orig Mon Jun 24 10:55:37 2002
|
||||
+++ configure
|
||||
@@ -3084,9 +3084,9 @@
|
||||
LDFLAGS="$LDFLAGS -Wl,-export-dynamic -L/usr/local/lib"
|
||||
;;
|
||||
netbsd*)
|
||||
- host_os="freebsd"
|
||||
- CFLAGS="$CFLAGS -I/usr/pkg/include -D_THREAD_SAFE -pthread"
|
||||
- LDFLAGS="$LDFLAGS -L/usr/pkg/lib -Wl,-export-dynamic"
|
||||
+ host_os="netbsd"
|
||||
+ CFLAGS="$CFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
|
||||
;;
|
||||
irix*)
|
||||
host_os="irix"
|
||||
@@ -3154,7 +3154,7 @@
|
||||
|
||||
if test "$host_os" = "beos"; then
|
||||
echo "configure: warning: skipping libdl check, using BeOS add-on mechanism" 1>&2
|
||||
-elif test "$host_os" = "freebsd"; then
|
||||
+elif test "$host_os" = "freebsd" -o "$host_os" = "netbsd"; then
|
||||
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
|
||||
echo "configure:3160: checking for dlopen in -lc" >&5
|
||||
ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
@@ -4155,47 +4155,8 @@
|
||||
#AM_CONDITIONAL(AM_ENABLE_CMDLINE, test "$cmdline" = "true")
|
||||
|
||||
|
||||
-echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
|
||||
-echo "configure:4160: checking for initscr in -lncurses" >&5
|
||||
-ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
|
||||
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
- echo $ac_n "(cached) $ac_c" 1>&6
|
||||
-else
|
||||
- ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lncurses $LIBS"
|
||||
-cat > conftest.$ac_ext <<EOF
|
||||
-#line 4168 "configure"
|
||||
-#include "confdefs.h"
|
||||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||||
-/* We use char because int might match the return type of a gcc2
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-char initscr();
|
||||
-
|
||||
-int main() {
|
||||
-initscr()
|
||||
-; return 0; }
|
||||
-EOF
|
||||
-if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
-else
|
||||
- echo "configure: failed program was:" >&5
|
||||
- cat conftest.$ac_ext >&5
|
||||
- rm -rf conftest*
|
||||
- eval "ac_cv_lib_$ac_lib_var=no"
|
||||
-fi
|
||||
-rm -f conftest*
|
||||
-LIBS="$ac_save_LIBS"
|
||||
-
|
||||
-fi
|
||||
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
- echo "$ac_t""yes" 1>&6
|
||||
- curses="ncurses"
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
-
|
||||
echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
|
||||
-echo "configure:4199: checking for initscr in -lcurses" >&5
|
||||
+echo "configure:4160: checking for initscr in -lcurses" >&5
|
||||
ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -4238,9 +4199,6 @@
|
||||
fi
|
||||
|
||||
|
||||
-fi
|
||||
-
|
||||
-
|
||||
if test "$curses" != ""; then
|
||||
OSDEPPLUGINS="$OSDEPPLUGINS plugins/ncurses.ui";
|
||||
CURSES="$curses";
|
||||
@@ -4934,9 +4892,9 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lmusicbrainz -ldl -lm -lstdc++ $LIBS"
|
||||
+LIBS="-lmusicbrainz -lm -lstdc++ $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
-#line 4940 "configure"
|
||||
+#line 4898 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
--- io/cd/unix/src/cdaudio.cpp.orig 2003-09-16 17:34:59.000000000 +0000
|
||||
+++ io/cd/unix/src/cdaudio.cpp
|
||||
@@ -114,8 +114,12 @@ cd_init_device(char *device_name)
|
||||
#endif
|
||||
#ifdef HAVE_GETMNTINFO
|
||||
int mounts;
|
||||
+#if defined(__NetBSD__)
|
||||
+ struct statvfs *mnt;
|
||||
+#else
|
||||
struct statfs *mnt;
|
||||
#endif
|
||||
+#endif
|
||||
char devname[255];
|
||||
struct stat st;
|
||||
int len = 0;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
$NetBSD: patch-ac,v 1.1.1.1 2003/07/06 19:52:56 rxg Exp $
|
||||
$NetBSD: patch-ac,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- Makefile.header.in.orig Mon Jul 1 20:17:25 2002
|
||||
+++ Makefile.header.in
|
||||
@@ -70,7 +70,7 @@
|
||||
--- base/include/queue.h.orig 2003-09-16 17:34:53.000000000 +0000
|
||||
+++ base/include/queue.h
|
||||
@@ -26,6 +26,7 @@ ________________________________________
|
||||
|
||||
OSDEPOBJ = @OSDEPOBJ@
|
||||
|
||||
-INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/plm/metadata/id3v2 -I$(srcdir)/lmc/wav/include $(OSINC)
|
||||
+INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/lmc/wav/include $(OSINC)
|
||||
|
||||
CXXFLAGS = $(EXTRA_CXXFLAGS)
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@@ -125,5 +125,5 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
-PIMAKE = $(MAKE) -f Makefile-plugins -$(MAKEFLAGS)
|
||||
+PIMAKE = $(MAKE) -f Makefile-plugins $(MAKEFLAGS)
|
||||
#include "config.h"
|
||||
#include "mutex.h"
|
||||
+#include <assert.h>
|
||||
|
||||
template<class T>
|
||||
class Queue {
|
||||
|
|
|
|||
|
|
@ -1,32 +1,20 @@
|
|||
$NetBSD: patch-ad,v 1.1.1.1 2003/07/06 19:52:57 rxg Exp $
|
||||
$NetBSD: patch-ad,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- Makefile.in.orig Mon Jun 24 07:44:27 2002
|
||||
+++ Makefile.in
|
||||
@@ -52,6 +52,7 @@
|
||||
ZINFsolarisOBJ = $(ZINFunixOBJ)
|
||||
ZINFlinuxOBJ = $(ZINFunixOBJ)
|
||||
ZINFfreebsdOBJ = $(ZINFunixOBJ)
|
||||
+ZINFnetbsdOBJ = $(ZINFunixOBJ)
|
||||
ZINFqnxOBJ = $(ZINFunixOBJ)
|
||||
ZINFirixOBJ = $(ZINFunixOBJ)
|
||||
--- base/include/player.h.orig 2010-11-09 09:33:12.000000000 +0000
|
||||
+++ base/include/player.h
|
||||
@@ -155,13 +155,13 @@ class Player : public EventQueue
|
||||
|
||||
#define _EQUALIZER_ENABLE_
|
||||
#ifdef _EQUALIZER_ENABLE_
|
||||
- void Player::SetEQData(Event *pEvent);
|
||||
+ void SetEQData(Event *pEvent);
|
||||
#endif // _EQUALIZER_ENABLE_
|
||||
#undef _EQUALIZER_ENABLE_
|
||||
|
||||
#define _VISUAL_ENABLE_
|
||||
#ifdef _VISUAL_ENABLE_
|
||||
- void Player::SendVisBuf(Event *pEvent);
|
||||
+ void SendVisBuf(Event *pEvent);
|
||||
#endif // _VISUAL_ENABLE_
|
||||
#undef _VISUAL_ENABLE_
|
||||
|
||||
@@ -73,6 +74,7 @@
|
||||
ZINFlinuxLIBS = -ldl -lpthread
|
||||
ZINFsolarisLIBS = -ldl -lpthread
|
||||
ZINFfreebsdLIBS = -pthread
|
||||
+ZINFnetbsdLIBS = -lpthread -lossaudio
|
||||
ZINFqnxLIBS = -lasound
|
||||
ZINFirixLIBS = -lpthread
|
||||
UNIXZINFLIBS = $(ZINF$(HOST_OS)LIBS) $(EXTRALIBS) -lmusicbrainz #-ldmallocthcxx
|
||||
@@ -142,9 +144,9 @@
|
||||
install-zinf: zinf
|
||||
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
$(INSTALL_PROGRAM) zinf $(DESTDIR)$(bindir)
|
||||
- $(mkinstalldirs) /usr/share/pixmaps
|
||||
+ $(mkinstalldirs) $(GTK_PREFIX)/share/pixmaps
|
||||
$(INSTALL_DATA) installer/unix/linux/zinf.png $(GTK_PREFIX)/share/pixmaps
|
||||
- $(mkinstalldirs) /usr/share/gnome/apps/Audio
|
||||
+ $(mkinstalldirs) $(GTK_PREFIX)/share/gnome/apps/Audio
|
||||
$(INSTALL_DATA) installer/unix/linux/Zinf.desktop $(GTK_PREFIX)/share/gnome/apps/Audio
|
||||
if test -f "MakeTheme"; then \
|
||||
$(INSTALL_PROGRAM) MakeTheme $(DESTDIR)$(bindir);\
|
||||
|
|
|
|||
|
|
@ -1,22 +1,13 @@
|
|||
$NetBSD: patch-ae,v 1.1.1.1 2003/07/06 19:52:57 rxg Exp $
|
||||
$NetBSD: patch-ae,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- base/src/thread.cpp.orig Mon Jul 1 20:22:22 2002
|
||||
+++ base/src/thread.cpp
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "thread.h"
|
||||
--- base/src/timer.cpp.orig 2003-09-16 17:34:54.000000000 +0000
|
||||
+++ base/src/timer.cpp
|
||||
@@ -33,7 +33,7 @@ using namespace std;
|
||||
#include "timer.h"
|
||||
|
||||
#if defined(__LINUX__) || defined(solaris) || defined(__FreeBSD__) || \
|
||||
#if defined(__linux__) || defined(solaris) || defined(__FreeBSD__) || \
|
||||
- defined(__QNX__) || defined(irix)
|
||||
+ defined(__QNX__) || defined(irix) || defined(__NetBSD__)
|
||||
#include "pthreadthread.h"
|
||||
#elif WIN32
|
||||
#include "win32thread.h"
|
||||
@@ -39,7 +39,7 @@
|
||||
{
|
||||
Thread* thread = NULL;
|
||||
#if defined(__LINUX__) || defined(solaris) || defined(__FreeBSD__) || \
|
||||
- defined(__QNX__) || defined(irix)
|
||||
+ defined(__QNX__) || defined(irix) || defined(__NetBSD__)
|
||||
thread = new pthreadThread();
|
||||
#elif WIN32
|
||||
thread = new win32Thread();
|
||||
+ defined(__NetBSD__) || defined(__QNX__) || defined(irix)
|
||||
#include <unistd.h>
|
||||
#define GoToSleep(x) usleep(x*1000)
|
||||
#elif defined(WIN32)
|
||||
|
|
|
|||
|
|
@ -1,23 +1,13 @@
|
|||
$NetBSD: patch-af,v 1.1.1.1 2003/07/06 19:52:57 rxg Exp $
|
||||
$NetBSD: patch-af,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- base/src/downloadmanager.cpp.orig Mon Jul 1 20:23:40 2002
|
||||
+++ base/src/downloadmanager.cpp
|
||||
@@ -35,7 +35,8 @@
|
||||
#include "downloadmanager.h"
|
||||
#include "musiccatalog.h"
|
||||
--- base/Makefile.in.orig 2004-02-17 22:11:09.000000000 +0000
|
||||
+++ base/Makefile.in
|
||||
@@ -245,7 +245,7 @@ zinf_SOURCES = src/log.cpp src/player.cp
|
||||
|
||||
-#if defined(unix) || defined(__BEOS__) || defined(_BSD_SOURCE)
|
||||
+#if defined(unix) || defined(__BEOS__) || defined(_BSD_SOURCE) || \
|
||||
+ defined(__NetBSD__)
|
||||
#define SOCKET int
|
||||
#endif
|
||||
|
||||
@@ -59,7 +60,7 @@
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
zinf_LDADD = $(top_builddir)/io/libio.la unix/libunix.la \
|
||||
- $(ZINF_LIBS) $(GDBM_LIBS) $(THREAD_LIBS) $(GLIB_LIBS) -ldl
|
||||
+ $(ZINF_LIBS) $(GDBM_LIBS) $(THREAD_LIBS) $(GLIB_LIBS) -lossaudio
|
||||
|
||||
zinf_LDFLAGS = -export-dynamic -L$(top_builddir)/mdb
|
||||
|
||||
-#if defined (unix) || defined(_BSD_SOURCE)
|
||||
+#if defined (unix) || defined(_BSD_SOURCE) || defined(__NetBSD__)
|
||||
#include <arpa/inet.h>
|
||||
#define closesocket(x) close(x)
|
||||
#ifndef O_BINARY
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-ag,v 1.1.1.1 2003/07/06 19:52:58 rxg Exp $
|
||||
$NetBSD: patch-ag,v 1.2 2010/11/10 05:33:54 rxg Exp $
|
||||
|
||||
--- base/src/timer.cpp.orig Mon Jul 1 20:25:24 2002
|
||||
+++ base/src/timer.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "timer.h"
|
||||
--- ui/corba/corbaUI.cpp.orig 2004-01-08 19:33:44.000000000 +0000
|
||||
+++ ui/corba/corbaUI.cpp
|
||||
@@ -44,7 +44,7 @@ using namespace std;
|
||||
#include "eventdata.h"
|
||||
|
||||
#if defined(__linux__) || defined(solaris) || defined(__FreeBSD__) || \
|
||||
- defined(__QNX__) || defined(irix)
|
||||
+ defined(__QNX__) || defined(irix) || defined(__NetBSD__)
|
||||
#include <unistd.h>
|
||||
#define GoToSleep(x) usleep(x*1000)
|
||||
#elif defined(WIN32)
|
||||
#include "MusicPlayer.h"
|
||||
-#include <orb/orbit.h>
|
||||
+#include <orbit/orbit.h>
|
||||
|
||||
|
||||
/** The server name */
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
$NetBSD: patch-ah,v 1.1.1.1 2003/07/06 19:52:58 rxg Exp $
|
||||
|
||||
--- lib/http/src/Http.cpp.orig Mon Jul 1 20:26:25 2002
|
||||
+++ lib/http/src/Http.cpp
|
||||
@@ -42,11 +42,12 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#if defined(unix) || defined(__BEOS__) || defined(_BSD_SOURCE)
|
||||
+#if defined(unix) || defined(__BEOS__) || defined(_BSD_SOURCE) || \
|
||||
+ defined(__NetBSD__)
|
||||
#define SOCKET int
|
||||
#endif
|
||||
|
||||
-#if defined(unix) || defined(_BSD_SOURCE)
|
||||
+#if defined(unix) || defined(_BSD_SOURCE) || defined(__NetBSD__)
|
||||
#include <arpa/inet.h>
|
||||
#define closesocket(x) close(x)
|
||||
#ifndef O_BINARY
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ai,v 1.1.1.1 2003/07/06 19:52:58 rxg Exp $
|
||||
|
||||
--- base/unix/src/unixprefs.cpp.orig Mon Jul 1 20:27:38 2002
|
||||
+++ base/unix/src/unixprefs.cpp
|
||||
@@ -495,7 +495,7 @@
|
||||
if (GetPrefString(kDatabaseDirPref, buf, &size) == kError_NoPrefValue) {
|
||||
char *fadir = FreeampDir(NULL);
|
||||
string tempdir = fadir;
|
||||
- tempdir += "/db/";
|
||||
+ tempdir += "/db";
|
||||
SetPrefString(kDatabaseDirPref, tempdir.c_str());
|
||||
delete [] fadir;
|
||||
}
|
||||
Loading…
Reference in a new issue