Update to 1.2.7; submitted by maintainer Wilbern Cobb <vedge@csoft.org>.

* Use the system libtool.
* Remove the disk writer flavor, include it by default.
* Add a gnome subpackage.

Notable changes in this release:

General:
* Replaced folder icons.
* Don't display playlist numbers elsewhere when turned off.
* Support 32-bit and 16-bit "bitfield" bmps in skins.
CD Audio:
* Supply a dummy user and hostname to the cddb server.
MPG123:
* Handle UTF-16 encoded tags.
* Major stability fixes.
This commit is contained in:
naddy 2002-03-11 17:38:05 +00:00
parent a743cb6436
commit 16d111e0af
14 changed files with 186 additions and 132 deletions

View File

@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.20 2002/02/19 00:17:23 brad Exp $
# $OpenBSD: Makefile,v 1.21 2002/03/11 17:38:05 naddy Exp $
# Uses pthreads
COMMENT= "Multimedia player for the X Window System"
COMMENT-diskwriter= "Disk writer output plugin for XMMS"
COMMENT-gnome= "GNOME applet for XMMS"
COMMENT-esd= "Esound output plugin for XMMS"
COMMENT-vorbis= "Ogg Vorbis input plugin for XMMS"
COMMENT-mikmod= "Mikmod input plugin for XMMS"
VERSION= 1.2.6
VERSION= 1.2.7
DISTNAME= xmms-${VERSION}
FULLPKGNAME= xmms-${VERSION}
FULLPKGNAME-diskwriter= xmms-diskwriter-${VERSION}
FULLPKGNAME-gnome= xmms-gnome-${VERSION}
FULLPKGNAME-esd= xmms-esd-${VERSION}
FULLPKGNAME-vorbis= xmms-vorbis-${VERSION}
FULLPKGNAME-mikmod= xmms-mikmod-${VERSION}
SUNDRIVER= xmms_sun-${VERSION}
CATEGORIES= audio
NEED_VERSION= 1.504
NEED_VERSION= 1.507
HOMEPAGE= http://www.xmms.org
MAINTAINER= Wilbern Cobb <vedge@csoft.org>
@ -37,9 +37,12 @@ MASTER_SITES0= http://vedge.com.ar/hack/ \
ftp://vedge.com.ar/pub/xmms/ \
http://mirror.csoft.org/xmms/
FLAVORS= no_esd no_vorbis no_mikmod
FLAVORS= no_gnome no_esd no_vorbis no_mikmod
FLAVOR?=
MULTI_PACKAGES= -diskwriter
MULTI_PACKAGES=
.if !${FLAVOR:L:Mno_gnome}
MULTI_PACKAGES+= -gnome
.endif
.if !${FLAVOR:L:Mno_esd}
MULTI_PACKAGES+= -esd
.endif
@ -56,10 +59,11 @@ RUN_DEPENDS= :unzip-*:archivers/unzip
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
xml.9::textproc/libxml1
USE_LIBTOOL= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --without-gnome
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
@ -70,26 +74,40 @@ DISTFILES= ${DISTNAME}.tar.gz \
${SUNDRIVER}.tar.gz:0
DOCS= README NEWS
SUBST_VARS= PKGNAME-diskwriter PKGNAME-vorbis PKGNAME-esd \
PKGNAME-mikmod
SUBST_VARS= PKGNAME-gnome PKGNAME-vorbis PKGNAME-esd PKGNAME-mikmod
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-diskwriter"
RUN_DEPENDS= ::audio/xmms
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-gnome"
#RUN_DEPENDS= ::audio/xmms
RUN_DEPENDS= ::/home/naddy/xmms
LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
panel_applet.0::x11/gnome/core
. endif
. if ${SUBPACKAGE} == "-esd"
LIB_DEPENDS= esd.2::audio/esound
RUN_DEPENDS= ::audio/xmms
#RUN_DEPENDS= ::audio/xmms
RUN_DEPENDS= ::/home/naddy/xmms
. endif
. if ${SUBPACKAGE} == "-vorbis"
LIB_DEPENDS= vorbis.0,vorbisfile.1::audio/libvorbis
RUN_DEPENDS= ::audio/xmms
#RUN_DEPENDS= ::audio/xmms
RUN_DEPENDS= ::/home/naddy/xmms
. endif
. if ${SUBPACKAGE} == "-mikmod"
LIB_DEPENDS= mikmod.0::audio/libmikmod
RUN_DEPENDS= ::audio/xmms
#RUN_DEPENDS= ::audio/xmms
RUN_DEPENDS= ::/home/naddy/xmms
. endif
.else
. if ${MULTI_PACKAGES:M-gnome}
LIB_DEPENDS+= gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
panel_applet.0::x11/gnome/core
CONFIGURE_ARGS+= --with-gnome=${LOCALBASE}
CONFIGURE_ENV+= CPP_FLAGS="-I${LOCALBASE}/include"
. else
CONFIGURE_ARGS+= --without-gnome
. endif
. if ${MULTI_PACKAGES:M-esd}
LIB_DEPENDS+= esd.2::audio/esound
CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE}
@ -120,5 +138,10 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/xmms
.if ${MULTI_PACKAGES:M-gnome}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xmms-gnome
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/xmms-gnome
.endif
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
MD5 (xmms-1.2.6.tar.gz) = 0a2d68ce07e4c30bc8b028a5d537930d
MD5 (xmms_sun-1.2.6.tar.gz) = 9ea17a44c697f0bb4db30a56f2cd25a0
RMD160 (xmms-1.2.6.tar.gz) = 3744af4b546068a2ad28a3241a11374c0bbfbdf1
RMD160 (xmms_sun-1.2.6.tar.gz) = 5cb9a8534146c80f86a3e2e2e8e26bab70dd36dc
SHA1 (xmms-1.2.6.tar.gz) = b60e7e60e9b20a9b37986ab3cc23edb92ad0a056
SHA1 (xmms_sun-1.2.6.tar.gz) = 433e33c631d46c8a1bd08e975a852ca83e727958
MD5 (xmms-1.2.7.tar.gz) = 8aa14a305d1eeb1bb53dba2197ba695a
MD5 (xmms_sun-1.2.7.tar.gz) = 57de928d27bf9a30f3859400e2d722f6
RMD160 (xmms-1.2.7.tar.gz) = 21618f8b827b7d08b867c7a5fdf0c57b8530a523
RMD160 (xmms_sun-1.2.7.tar.gz) = 90943949d9c728a77d31235c96c893d250f87afc
SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68
SHA1 (xmms_sun-1.2.7.tar.gz) = a9e9f476a9a33fc9239baaa2604d8ee2d96098fd

View File

@ -1,7 +1,15 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2002/02/10 07:47:42 pvalchev Exp $
--- aclocal.m4.orig Tue Jan 8 09:14:00 2002
+++ aclocal.m4 Thu Feb 7 13:40:31 2002
@@ -3211,9 +3211,14 @@ openbsd*)
--- aclocal.m4.orig Mon Mar 4 17:56:49 2002
+++ aclocal.m4 Thu Mar 7 01:23:56 2002
@@ -1082,7 +1082,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
@@ -3211,9 +3211,14 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@ -17,7 +25,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/02/10 07:47:42 pvalchev Exp $
shlibpath_overrides_runpath=no
;;
*)
@@ -3221,6 +3226,7 @@ openbsd*)
@@ -3221,6 +3226,7 @@
;;
esac
else
@ -25,7 +33,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2002/02/10 07:47:42 pvalchev Exp $
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
@@ -5131,10 +5137,9 @@ AC_DEFUN(AM_WITH_NLS,
@@ -5131,10 +5137,9 @@
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,

View File

@ -1,18 +1,6 @@
$OpenBSD: patch-libxmms_configure_in,v 1.3 2002/02/05 04:07:57 pvalchev Exp $
$OpenBSD: patch-libxmms_configure_in,v 1.4 2002/03/11 17:38:05 naddy Exp $
--- libxmms/configure.in.orig Wed Dec 5 16:33:25 2001
+++ libxmms/configure.in Mon Jan 21 10:29:48 2002
@@ -5,9 +5,9 @@
AM_CONFIG_HEADER(config.h)
dnl libtool version:
-LIBXMMS_MAJOR_VERSION=3
+LIBXMMS_MAJOR_VERSION=2
LIBXMMS_MINOR_VERSION=0
-LIBXMMS_MICRO_VERSION=2
+LIBXMMS_MICRO_VERSION=2
LIBXMMS_VERSION=$LIBXMMS_MAJOR_VERSION.$LIBXMMS_MINOR_VERSION.$LIBXMMS_MICRO_VERSION
AM_INIT_AUTOMAKE(libxmms, $LIBXMMS_VERSION)
@@ -30,7 +30,7 @@
XMMS_FUNC_POSIX(sched_setscheduler nanosleep)

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2002/02/05 04:07:57 pvalchev Exp $
--- po/Makefile.in.in.orig Sat Feb 17 04:46:32 2001
+++ po/Makefile.in.in Sun May 20 16:47:27 2001
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +123,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

View File

@ -1,29 +1,6 @@
$OpenBSD: patch-xmms_main_c,v 1.3 2002/02/05 04:07:57 pvalchev Exp $
$OpenBSD: patch-xmms_main_c,v 1.4 2002/03/11 17:38:05 naddy Exp $
--- xmms/main.c.orig Fri Dec 28 08:32:28 2001
+++ xmms/main.c Fri Jan 18 07:39:27 2002
@@ -3235,20 +3235,14 @@
xmms_remote_stop(opt->session);
if (opt->fwd)
xmms_remote_playlist_next(opt->session);
+#if 0
if (opt->play_pause)
xmms_remote_play_pause(opt->session);
+#endif
if (opt->mainwin)
xmms_remote_main_win_toggle(opt->session, TRUE);
}
-void segfault_handler(int sig)
-{
- printf(_("\nSegmentation fault\n\n"
- "You've probably found a bug in XMMS, please visit\n"
- "http://bugs.xmms.org and fill out a bug report.\n\n"));
- exit(1);
-}
-
static gboolean pposition_configure(GtkWidget *w, GdkEventConfigure *event, gpointer data)
{
gint x,y;
@@ -3379,7 +3373,8 @@
#endif

View File

@ -0,0 +1,28 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
FILES='
CORBA/servers/gnomexmms.gnorba
'
echo
echo "+--------------- $1"
echo "| To really remove $1 from your system you should also"
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
echo "| If you are planning on installing $1 again in the future"
echo "| you can leave it as it is."
echo "|"
echo "| FYI, the following configuration files belongs to this package:"
echo "|"
for f in ${FILES}; do
echo "| ${SYSCONFDIR}/$f"
done
echo "+--------------- $1"
echo
exit 0

View File

@ -1,3 +0,0 @@
Dumps XMMS output to a .wav file.
WWW: ${HOMEPAGE}

View File

@ -0,0 +1,3 @@
GNOME interface of XMMS (gnomexmms).
WWW: ${HOMEPAGE}

View File

@ -0,0 +1,83 @@
#!/bin/sh
#
# $OpenBSD: INSTALL-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
set -e
PREFIX=${PKG_PREFIX:-/usr/local}
PATH=/bin:/usr/bin:/sbin:/usr/sbin
P_NAME=xmms-gnome
DEST_PFX=${SYSCONFDIR}
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
FILES='
CORBA/servers/gnomexmms.gnorba
'
do_post() {
echo
echo "+--------------- ${P_NAME}"
# install or take note of existing config files
for f in ${FILES}; do
if [ -f "${DEST_PFX}/$f" ]; then
OLD_CONFS="${OLD_CONFS} $f"
else
if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
exit 1
fi
NEW_CONFS="${NEW_CONFS} $f"
fi
done
# print status report
if [ -n "${NEW_CONFS}" ]; then
echo "| The following NEW configuration files have been installed:"
echo "|"
for f in ${NEW_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
if [ -n "${OLD_CONFS}" ]; then
if [ -n "${NEW_CONFS}" ]; then
echo "|"
fi
echo "| The following OLD configuration files was found and have NOT been overwritten:"
echo "| You should however manually compare them to their equivalents in "
echo "|"
echo "| ${SOURCE_PFX}"
echo "|"
echo "| and update your configuration if needed."
echo "|"
for f in ${OLD_CONFS}; do
echo "| ${DEST_PFX}/$f"
done
fi
echo "+--------------- ${P_NAME}"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
do_post
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2002/02/05 04:07:57 pvalchev Exp $
@comment $OpenBSD: PFRAG.shared,v 1.7 2002/03/11 17:38:05 naddy Exp $
lib/libxmms.la
lib/libxmms.so.2.0
lib/libxmms.so.3.1
DYNLIBDIR(%B)
lib/xmms/Output/libdisk_writer.so
lib/xmms/Output/libsun.so
lib/xmms/Input/libwav.so
lib/xmms/Input/libtonegen.so

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-diskwriter,v 1.1 2002/02/05 04:07:57 pvalchev Exp $
lib/xmms/Output/libdisk_writer.so

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-diskwriter,v 1.1 2002/02/05 04:07:57 pvalchev Exp $
%%SHARED%%

View File

@ -0,0 +1,8 @@
@comment $OpenBSD: PLIST-gnome,v 1.1 2002/03/11 17:38:05 naddy Exp $
bin/gnomexmms
man/man1/gnomexmms.1
share/applets/Multimedia/gnomexmms.desktop
share/examples/xmms-gnome/CORBA/servers/gnomexmms.gnorba
@dirrm share/examples/xmms-gnome/CORBA/servers
@dirrm share/examples/xmms-gnome/CORBA
@dirrm share/examples/xmms-gnome