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

Fix a few details. Mostly MULTI_PACKAGES plugins.

Browse Source
This commit is contained in:
espie 2001-07-25 12:52:24 +00:00
parent 88da7a3a06
commit f7475b29aa
17 changed files with 138 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
audio/xmms/Makefile
View File

@ -1,14 +1,23 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/07/20 14:26:16 espie Exp $
# $OpenBSD: Makefile,v 1.2 2001/07/25 12:52:24 espie Exp $
# $Id: Makefile,v 1.2 2001/07/25 12:52:24 espie Exp $
COMMENT= "XMMS multimedia player"
VER= 1.2.5
NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
DISTNAME= xmms-${VER}
DISTDRIVER= xmms_sun-${VER}
COMMENT= "Multimedia player for the X Window System"
COMMENT-esd= "Esound output plugin for XMMS"
COMMENT-vorbis= "Ogg Vorbis input plugin for XMMS"
VERSION= 1.2.5
DISTNAME= xmms-${VERSION}
PKGNAME-esd= xmms-esd-${VERSION}
PKGNAME-vorbis= xmms-vorbis-${VERSION}
DISTDRIVER= xmms_sun-${VERSION}-p1
CATEGORIES= audio
NEED_VERSION= 1.402
HOMEPAGE= http://www.xmms.org
MAINTAINER= Wilbern Cobb <cobb@vedge.com.ar>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -21,17 +30,25 @@ MASTER_SITES= http://www.xmms.org/files/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/ \
ftp://ftp.stealth.net/xmms/%SUBDIR%/
MASTER_SITES0= http://vedge.com.ar/hack/
MASTER_SITES0= http://vedge.com.ar/hack/
FLAVORS= esd vorbis
FLAVORS= no_esd no_vorbis
FLAVOR?=
MULTI_PACKAGES=
.if ${FLAVOR:L:Nno_esd}
MULTI_PACKAGES+= -esd
.endif
.if ${FLAVOR:L:Nno_vorbis}
MULTI_PACKAGES+= -vorbis
.endif
LIB_DEPENDS= gtk.1.2::x11/gtk+ \
iconv.2::converters/libiconv \
intl.1::devel/gettext \
xml.9::textproc/libxml1
SUBPACKAGE?=
RUN_DEPENDS= unzip::archivers/unzip
LIB_DEPENDS= gtk.1.2::x11/gtk+ \
iconv.2::converters/libiconv \
intl.1::devel/gettext \
xml.9::textproc/libxml1
USE_X11= Yes
USE_GMAKE= Yes
@ -40,37 +57,48 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --without-gnome
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
XML_CONFIG="${LOCALBASE}/bin/xml-config"
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
XML_CONFIG="${LOCALBASE}/bin/xml-config" \
LIBMIKMOD_CONFIG=/no
DISTFILES= ${DISTNAME}.tar.gz \
DISTFILES= ${DISTNAME}.tar.gz \
${DISTDRIVER}.tar.gz:0
DOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS \
DOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS \
README TODO
.if ${FLAVOR:L:Mesd}
LIB_DEPENDS+= esd.2::audio/esound
SUBST_VARS= MAINTAINER
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-esd"
LIB_DEPENDS= esd.::audio/esound
RUN_DEPENDS= xmms::audio/xmms
. endif
. if ${SUBPACKAGE} == "-vorbis"
LIB_DEPENDS= vorbis.::audio/libvorbis
RUN_DEPENDS= xmms::audio/xmms
. endif
.else
. if ${MULTI_PACKAGES:M-esd}
LIB_DEPENDS += esd.::audio/esound
CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE}
. else
CONFIGURE_ENV+= ESD_CONFIG=/no
.endif
. endif
# Trip up configure
CONFIGURE_ENV+= LIBMIKMOD_CONFIG=/no
.if ${FLAVOR:L:Mvorbis}
LIB_DEPENDS+= vorbis.0::audio/libvorbis
. if ${MULTI_PACKAGES:M-vorbis}
LIB_DEPENDS += vorbis.::audio/libvorbis
CONFIGURE_ARGS+= --with-ogg-prefix=${LOCALBASE} \
--with-vorbis-prefix=${LOCALBASE}
.else
CONFIGURE_ENV+= OGG_LIBS=its-not-my-godamn-planet-understand-monkey-boy
. else
CONFIGURE_ENV+= OGG_LIBS=its-not-my-godamn-planet-understand-monkey-boy
. endif
.endif
SUBST_VARS=MAINTAINER
post-extract:
@mv -f ${WRKDIR}/${DISTDRIVER}/Output/sun ${WRKSRC}/Output/sun; \
@mv -f ${WRKDIR}/${DISTDRIVER}/Output/sun ${WRKSRC}/Output/sun
pre-build:
@ln -sf ${LOCALBASE}/include/libintl.h ${WRKSRC}/intl

6
audio/xmms/files/md5
View File

@ -1,6 +1,6 @@
MD5 (xmms-1.2.5.tar.gz) = 99bc40bffa66789ecc9d91ce7ae4ed09
RMD160 (xmms-1.2.5.tar.gz) = 8669882f390a2474d868b9c8fb970125e0553033
SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
MD5 (xmms_sun-1.2.5.tar.gz) = 93d956ab37a2e0fc1eea1d6e59661ce7
RMD160 (xmms_sun-1.2.5.tar.gz) = 480635a79469b51fc8733a4e53aa39896440839e
SHA1 (xmms_sun-1.2.5.tar.gz) = a095791fa7029b93a7e60cb7d047a4582768d36f
MD5 (xmms_sun-1.2.5-p1.tar.gz) = b4af4c3688f3e8f58068d94a1b980714
RMD160 (xmms_sun-1.2.5-p1.tar.gz) = 63cb13ab3d6c679a6bea1027a666e8183dedd5a5
SHA1 (xmms_sun-1.2.5-p1.tar.gz) = 263047d407fd34cec61edd0f9206451ac1ee5c6d

41
audio/xmms/patches/patch-configure_in
View File

@ -1,6 +1,17 @@
--- configure.in.orig Mon Jun 18 15:58:21 2001
+++ configure.in Wed Jul 11 11:02:52 2001
@@ -43,10 +43,9 @@
+++ configure.in Tue Jul 24 03:08:11 2001
@@ -18,6 +18,10 @@
[ --disable-user-plugin-dir disable per-user plugin dir],,
enable_user_plugin_dir="yes")
+AC_ARG_WITH( gl-prefix,
+[ --with-gl-prefix Prefix where OpenGL is installed],,
+ gl_prefix="$withval", gl_prefix="$X11BASE")
+
AC_ARG_WITH(dev-dsp,
[ --with-dev-dsp=path Path to OSS DSP data pipe, default is /dev/dsp.],
dev_dsp="$withval", dev_dsp="/dev/dsp")
@@ -43,10 +47,9 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
@ -12,7 +23,7 @@
AC_PATH_PROG(XMMS_PATH,xmms,no)
LIBS_save=$LIBS
@@ -73,7 +72,6 @@
@@ -73,7 +76,6 @@
LIBS=$LIBS_save
AC_SUBST(VM_LIBS)
@ -20,24 +31,30 @@
AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
AC_EGREP_CPP(yes,
[#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001
@@ -100,7 +98,6 @@
@@ -100,19 +102,18 @@
if test "x$PTHREAD_LIBS" = xerror; then
AC_MSG_ERROR(*** Unable to locate working posix thread library ***)
fi
-AC_SUBST(PTHREAD_LIBS)
LIBS_save=$LIBS
LIBS="$LIBS $GTK_LIBS"
@@ -112,7 +109,7 @@
-LIBS="$LIBS $GTK_LIBS"
+LIBS="$LIBS $GTK_LIBS -L$gl_prefix/lib"
OPENGL_LIBS=error
AC_CHECK_LIB(GL, glBegin, OPENGL_LIBS="-lGL")
if test "x$OPENGL_LIBS" = xerror; then
- AC_CHECK_LIB(MesaGL, glBegin,OPENGL_LIBS="-lMesaGL")
+ AC_CHECK_LIB(MesaGL, glBegin,OPENGL_LIBS="-lMesaGL")
fi
CPPFLAGS_save=$CPPFLAGS
-CPPFLAGS="$GTK_CFLAGS $CPPFLAGS"
+CPPFLAGS="$GTK_CFLAGS $CPPFLAGS -I$X11BASE/include"
+CPPFLAGS="$GTK_CFLAGS $CPPFLAGS -I$gl_prefix/include"
have_opengl_headers=yes
AC_CHECK_HEADERS(GL/gl.h GL/glx.h,,have_opengl_headers=no)
@@ -335,13 +332,9 @@
@@ -335,13 +336,9 @@
arch_type=other
have_solaris=no
@ -52,7 +69,7 @@
ppc-*-*)
arch_type=ppc
;;
@@ -351,12 +344,29 @@
@@ -351,12 +348,29 @@
*-sun-*)
have_solaris=yes
;;
@ -82,7 +99,7 @@
plugindir=$libdir/xmms
AC_SUBST(plugindir)
@@ -384,7 +394,7 @@
@@ -384,7 +398,7 @@
AC_SUBST(VISUALIZATION_PLUGIN_DIR)
AC_SUBST(pluginsubs)
@ -91,7 +108,7 @@
if test "x$enable_user_plugin_dir" = "xno"; then
AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
@@ -411,6 +421,7 @@
@@ -411,6 +425,7 @@
Output/esd/Makefile
Output/disk_writer/Makefile
Output/solaris/Makefile
@ -99,7 +116,7 @@
Input/Makefile
Input/wav/Makefile
Input/mpg123/Makefile
@@ -454,6 +465,7 @@
@@ -454,6 +469,7 @@
echo " Build mikmod plugin: $have_mikmod"
echo " Build Ogg Vorbis plugin: $have_oggvorbis"
echo " Build Solaris plugin: $have_solaris"

2
audio/xmms/patches/patch-ltconfig
View File

@ -1,4 +1,4 @@
$Id: patch-ltconfig,v 1.1.1.1 2001/07/20 14:26:16 espie Exp $
$Id: patch-ltconfig,v 1.2 2001/07/25 12:52:24 espie Exp $
vim:syn=diff
--- ltconfig.orig Wed Mar 21 10:22:22 2001

2
audio/xmms/patches/patch-ltmain_sh
View File

@ -1,4 +1,4 @@
$Id: patch-ltmain_sh,v 1.1.1.1 2001/07/20 14:26:16 espie Exp $
$Id: patch-ltmain_sh,v 1.2 2001/07/25 12:52:24 espie Exp $
vim:syn=diff
--- ltmain.sh.orig Fri Feb 18 20:59:48 2000

2
audio/xmms/pkg/DESCR
View File

@ -1,4 +1,4 @@
XMMS - Multimedia player for the X Window System.
XMMS - Multimedia player for the X Window System
X Multimedia System is a sound player written from scratch. Since it
uses the WinAmp GUI, it can use WinAmp skins. It can play mp3s, mods,

5
audio/xmms/pkg/DESCR-esd Normal file
View File

@ -0,0 +1,5 @@
XMMS - Esound output plugin
This is a XMMS output plugin for the Enlightened Sound Daemon.
WWW: ${HOMEPAGE}

5
audio/xmms/pkg/DESCR-vorbis Normal file
View File

@ -0,0 +1,5 @@
XMMS - Ogg Vorbis input plugin
This is a XMMS input plugin for the Ogg Vorbis files.
WWW: ${HOMEPAGE}

15
audio/xmms/pkg/MESSAGE
View File

@ -1,8 +1,11 @@
To use native audio, pick the Sun output plugin in the XMMS preferences
window (ctrl-p).
To go easier on resources, don't use the `scope' visualization mode, and
increasing the buffer size in audio preferences significantly might help.
If all else fails, use renice(8) on XMMS. Enabling the `XMMS uses mixer
exclusively' option may be of some help on extremely slow systems.
To use native audio, pick the Sun output plugin in the XMMS
preferences window (ctrl-p).
Depending on your audio hardware and driver, you may want to
fine-tune the buffer size in audio preferences. Usually you
should decrease the buffer size if your hardware can handle it.
Please direct issues regarding the Sun output driver to the
author, ${MAINTAINER}.

4
audio/xmms/pkg/MESSAGE-esd Normal file
View File

@ -0,0 +1,4 @@
You may enable the Esound output plugin by selecting it in the
preferences window (ctrl-p).

4
audio/xmms/pkg/MESSAGE-vorbis Normal file
View File

@ -0,0 +1,4 @@
You may enable the Ogg Vorbis input plugin by selecting it in the
preferences window (ctrl-p).

6
audio/xmms/pkg/PFRAG.shared
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/07/20 14:26:16 espie Exp $
%%esd%%
%%vorbis%%
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/07/25 12:52:24 espie Exp $
@comment $Id: PFRAG.shared,v 1.2 2001/07/25 12:52:24 espie Exp $
lib/libxmms.la
lib/libxmms.so.2.0
DYNLIBDIR(%B)
lib/xmms/Output/libsun.la
lib/xmms/Output/libsun.so.0.0
lib/xmms/Output/libdisk_writer.la

4
audio/xmms/pkg/PFRAG.shared-esd Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PFRAG.shared-esd,v 1.1 2001/07/25 12:52:24 espie Exp $
@comment $Id: PFRAG.shared-esd,v 1.1 2001/07/25 12:52:24 espie Exp $
lib/xmms/Output/libesdout.la
lib/xmms/Output/libesdout.so.0.0

4
audio/xmms/pkg/PFRAG.shared-vorbis Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PFRAG.shared-vorbis,v 1.1 2001/07/25 12:52:24 espie Exp $
@comment $Id: PFRAG.shared-vorbis,v 1.1 2001/07/25 12:52:24 espie Exp $
lib/xmms/Input/libvorbis.la
lib/xmms/Input/libvorbis.so.0.0

9
audio/xmms/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $Id: PLIST,v 1.1.1.1 2001/07/20 14:26:16 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/07/25 12:52:24 espie Exp $
@comment $Id: PLIST,v 1.2 2001/07/25 12:52:24 espie Exp $
bin/xmms-config
bin/xmms
bin/wmxmms
@ -58,12 +59,6 @@ share/locale/uk/LC_MESSAGES/xmms.mo
share/locale/wa/LC_MESSAGES/xmms.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
share/locale/zh_TW/LC_MESSAGES/xmms.mo
@dirrm lib/xmms/Output
@dirrm lib/xmms/Input
@dirrm lib/xmms/Effect
@dirrm lib/xmms/General
@dirrm lib/xmms/Visualization
@dirrm lib/xmms
@dirrm include/xmms
@dirrm share/xmms
@dirrm share/doc/xmms

3
audio/xmms/pkg/PLIST-esd Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-esd,v 1.1 2001/07/25 12:52:24 espie Exp $
@comment $Id: PLIST-esd,v 1.1 2001/07/25 12:52:24 espie Exp $
%%SHARED%%

3
audio/xmms/pkg/PLIST-vorbis Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-vorbis,v 1.1 2001/07/25 12:52:24 espie Exp $
@comment $Id: PLIST-vorbis,v 1.1 2001/07/25 12:52:24 espie Exp $
%%SHARED%%