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

update to 0.2.38 plus some minor changes and cleanups

Browse Source 
steven@ says it does not break builk build
ok naddy@, simon@; "ok ok ok" jasper@
This commit is contained in:
martynas 2007-06-26 17:10:29 +00:00
parent a9f2e37312
commit 41febcc0fa
12 changed files with 98 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/esound/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.39 2006/10/28 10:30:41 espie Exp $
# $OpenBSD: Makefile,v 1.40 2007/06/26 17:10:29 martynas Exp $
# $FreeBSD: Makefile,v 1.8 1999/03/09 01:08:46 nectar Exp $
COMMENT= "sound library for Enlightenment"
DISTNAME= esound-0.2.34
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += esd 2.34 # .2.34
DISTNAME= esound-0.2.38
SHARED_LIBS += esd 2.38 # .2.38
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/esound/0.2/}
@ -22,14 +21,23 @@ WANTLIB= c m wrap
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
AUTOCONF_VERSION=2.13
AUTOCONF_VERSION=2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-alsa \
--disable-oss \
--with-libwrap
# broken, relies upon v4-mapped addresses
CONFIGURE_ARGS+= --disable-ipv6
FAKE_FLAGS= DESTDIR=${WRKINST} \
esdconfdir=${PREFIX}/share/examples/esound
post-extract:
@cp -f ${FILESDIR}/audio_sun.c ${WRKSRC}
pre-configure:
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|' \
${WRKSRC}/test-script
.include <bsd.port.mk>

10
audio/esound/distinfo
View File

@ -1,5 +1,5 @@
MD5 (esound-0.2.34.tar.gz) = lSbU/7u9lGJ2izjAgscmxw==
RMD160 (esound-0.2.34.tar.gz) = +/rAann7gX+e9h14CJRfe6h8ARA=
SHA1 (esound-0.2.34.tar.gz) = T6H7MhIZl/6edQe/WvKWpkvAoiA=
SHA256 (esound-0.2.34.tar.gz) = ass7wF3kshz9cpH93R9XwooxyHLuYGowp4ktAkLdznU=
SIZE (esound-0.2.34.tar.gz) = 392336
MD5 (esound-0.2.38.tar.gz) = d8TpgFoBf7oGVSSH3zxmYg==
RMD160 (esound-0.2.38.tar.gz) = OwL3H38UZcIECjzwETbzHWJnfmE=
SHA1 (esound-0.2.38.tar.gz) = QFQ9y1sVcsdwKwuwt1aEQEY1G6U=
SHA256 (esound-0.2.38.tar.gz) = SKOU83d2M2JmBnlKUpTwHilOERTWzD54lMapDyImsGc=
SIZE (esound-0.2.38.tar.gz) = 519964

11
audio/esound/patches/patch-Makefile.in
View File

@ -1,11 +0,0 @@
--- Makefile.in.orig Tue Mar 16 07:26:18 2004
+++ Makefile.in Thu Jun 24 20:07:12 2004
@@ -180,7 +180,7 @@ esd_LDADD = $(WRAP_LIB) $(LDADD)
m4datadir = $(datadir)/aclocal
m4data_DATA = esd.m4
-esdconfdir = $(sysconfdir)
+esdconfdir = $(datadir)/examples/esound
esdconf_DATA = esd.conf
pkgconfigdir = $(libdir)/pkgconfig

10
audio/esound/patches/patch-acconfig_h
View File

@ -1,10 +0,0 @@
--- acconfig.h.orig Thu Jan 15 05:49:09 2004
+++ acconfig.h Thu Jun 24 20:09:24 2004
@@ -11,6 +11,7 @@
#undef DRIVER_ALSA_09_NEW_PCM_API
#undef DRIVER_DART
#undef DRIVER_COREAUDIO
+#undef DRIVER_SUN
#undef DRIVER_NONE
#undef HAVE_INET_ATON
#undef HAVE_INET_PTON

50
audio/esound/patches/patch-audio_c
View File

@ -1,11 +1,39 @@
--- audio.c.orig Tue Jun 4 10:40:44 2002
+++ audio.c Fri Jul 19 18:32:52 2002
@@ -25,6 +25,8 @@ static int esd_audio_fd = -1;
# include "audio_alsa.c"
#elif defined(DRIVER_ALSA_09)
#include "audio_alsa09.c"
+#elif defined(DRIVER_SUN)
+# include "audio_sun.c"
#elif defined(DRIVER_OSS)
# include "audio_oss.c"
#elif defined(DRIVER_AIX)
$OpenBSD: patch-audio_c,v 1.3 2007/06/26 17:10:29 martynas Exp $
--- audio.c.orig Thu Apr 19 17:43:59 2007
+++ audio.c Sat Jun 2 23:15:49 2007
@@ -20,34 +20,7 @@ static int esd_audio_fd = -1;
/*******************************************************************/
/* returns audio_fd for use by main prog - platform dependent */
-/* ALSA before OSS as ALSA is OSS compatible */
-#if defined(DRIVER_ALSA_09)
-# include "audio_alsa09.c"
-#elif defined(DRIVER_ALSA) || defined(DRIVER_NEWALSA)
-# include "audio_alsa.c"
-#elif defined(DRIVER_OSS)
-# include "audio_oss.c"
-#elif defined(DRIVER_AIX)
-# include "audio_aix.c"
-#elif defined(DRIVER_IRIX)
-# include "audio_irix.c"
-#elif defined(DRIVER_HPUX)
-# include "audio_hpux.c"
-#elif defined(DRIVER_OSF)
-# include "audio_osf.c"
-#elif defined(DRIVER_SOLARIS)
-# include "audio_solaris.c"
-#elif defined(DRIVER_MKLINUX)
-# include "audio_mklinux.c"
-#elif defined(DRIVER_DART)
-# include "audio_dart.c"
-#elif defined(DRIVER_COREAUDIO)
-# include "audio_coreaudio.c"
-#elif defined(DRIVER_ARTS)
-# include "audio_arts.c"
-#else
-# include "audio_none.c"
-#endif
+#include "audio_sun.c"
/*******************************************************************/
/* display available devices */

10
audio/esound/patches/patch-config_h_in
View File

@ -1,10 +0,0 @@
--- config.h.in.orig Tue Mar 16 07:25:33 2004
+++ config.h.in Thu Jun 24 20:10:12 2004
@@ -45,6 +45,7 @@
#undef DRIVER_ALSA_09_NEW_PCM_API
#undef DRIVER_DART
#undef DRIVER_COREAUDIO
+#undef DRIVER_SUN
#undef DRIVER_NONE
#undef HAVE_INET_ATON
#undef HAVE_INET_PTON

36
audio/esound/patches/patch-configure_in → audio/esound/patches/patch-configure_ac
View File

@ -1,34 +1,24 @@
--- configure.in.orig Tue Mar 16 07:20:39 2004
+++ configure.in Thu Jun 24 20:07:12 2004
@@ -205,6 +205,16 @@ if test "x$enable_local_sound" = "xyes";
esac
$OpenBSD: patch-configure_ac,v 1.1 2007/06/26 17:10:29 martynas Exp $
--- configure.ac.orig Thu May 3 23:47:30 2007
+++ configure.ac Sun Jun 3 00:20:33 2007
@@ -306,16 +306,11 @@ if test "x$enable_local_sound" = "xyes"; then
fi
fi
+ if test "${ac_cv_header_sys_audioio_h}" = "yes"; then
+ case ${host_os} in
+ openbsd* | netbsd*)
+ found_sound=yes
+ DRIVER_SUN=1
+ AC_DEFINE(DRIVER_SUN)
+ ;;
+ esac
+ fi
+
case ${host_os} in
os2*)
found_sound=yes
@@ -263,7 +273,9 @@ if test "x$enable_local_sound" = "xyes";
- if test "$found_sound" = "no"; then
- AC_MSG_ERROR([Could not find a support sound driver])
- fi
-
dnl Check for additional audio libs needed
echo "---------------------------------------------------------------------"
echo "--- Checking to see which audio libraries are required for linking.";
echo "--- Most of these checks should also fail. Do not be alarmed.";
- AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
+ if test ! "$DRIVER_SUN"; then
+ AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
+ fi
AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
if test "x$enable_alsa" = "xyes"; then
AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
@@ -382,7 +394,8 @@ if test "x$with_libwrap" = "xyes"; then
@@ -393,7 +388,8 @@ if test "x$with_libwrap" = "xyes"; then
wrap_ok=no
AC_TRY_LINK(
@ -38,7 +28,7 @@
#include <syslog.h>
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;],
@@ -392,7 +405,8 @@ int deny_severity = LOG_WARNING;],
@@ -403,7 +399,8 @@ int deny_severity = LOG_WARNING;],
wrap_ok=yes],
[LIBS="$LIBS -lnsl"
AC_TRY_LINK(

7
audio/esound/patches/patch-esd.c → audio/esound/patches/patch-esd_c
View File

@ -1,6 +1,7 @@
--- esd.c.orig Wed Jan 14 07:00:46 2004
+++ esd.c Thu Jun 24 20:07:12 2004
@@ -236,12 +236,12 @@ struct stat dir_stats;
$OpenBSD: patch-esd_c,v 1.1 2007/06/26 17:10:29 martynas Exp $
--- esd.c.orig Thu May 3 23:28:35 2007
+++ esd.c Sat Jun 2 23:17:14 2007
@@ -274,12 +274,12 @@ struct stat dir_stats;
#if defined(S_ISVTX)
#define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\

10
audio/esound/patches/patch-test-script
View File

@ -1,16 +1,18 @@
--- test-script.orig Wed Jul 15 04:26:14 1998
+++ test-script Tue Mar 5 09:21:40 2002
$OpenBSD: patch-test-script,v 1.3 2007/06/26 17:10:29 martynas Exp $
--- test-script.orig Thu Apr 19 17:43:59 2007
+++ test-script Sat Jun 2 23:18:12 2007
@@ -1,4 +1,4 @@
-#!/bin/tcsh
+#!/usr/local/bin/tcsh
+#!_LOCALBASE_/bin/tcsh
echo welcome to the test.
echo ""
@@ -40,7 +40,6 @@ echo $< >& /dev/null
@@ -40,7 +40,7 @@ echo $< >& /dev/null
esdmon > sample.raw &
esdcat -b -m -r 11025 test.wav
sleep 3
-killall esdmon
+pkill esdmon
echo press enter to continue...
echo $< >& /dev/null

18
audio/esound/patches/patch-util_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
--- util.c.orig Mon Mar 1 12:06:58 2004
+++ util.c Thu Jun 24 20:15:35 2004
$OpenBSD: patch-util_c,v 1.3 2007/06/26 17:10:29 martynas Exp $
--- util.c.orig Thu Apr 19 17:43:59 2007
+++ util.c Sat Jun 2 23:38:31 2007
@@ -1,5 +1,8 @@
#include "config.h"
#include "esd.h"
@ -10,11 +10,11 @@ $OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
#include <sys/types.h>
#include <sys/socket.h>
#include <stdlib.h>
@@ -23,38 +26,31 @@ have_ipv6() {
@@ -23,38 +26,31 @@ have_ipv6(void) {
const char*
esd_get_socket_dirname (void)
{
- char *audiodev;
- const char *audiodev;
- static char *dirname = NULL;
+ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
+ struct passwd *pw;
@ -32,7 +32,7 @@ $OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
- strcpy(dirname, "/tmp/.esd");
- strcat(dirname, audiodev);
+ if (sockdir != NULL)
+ return (sockdir);
+ return sockdir;
+ pw = getpwuid(getuid());
+ if (pw == NULL || pw->pw_dir == NULL) {
+ fprintf(stderr, "esd: could not find home directory\n");
@ -43,7 +43,7 @@ $OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
+ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir);
+ endpwent();
+ sockdir = sockdirbuf;
+ return (sockdir);
+ return sockdir;
}
const char*
@ -62,9 +62,9 @@ $OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
-
- return name;
+ if (sockname != NULL)
+ return (sockname);
+ return sockname;
+ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket",
+ esd_get_socket_dirname());
+ sockname = socknamebuf;
+ return (sockname);
+ return sockname;
}

7
audio/esound/pkg/DESCR
View File

@ -1 +1,6 @@
sound library for Enlightenment
Esound is an audio mixing server that allows multiple applications
to output sound to the same audio device.
Esound is seriously lacking in features required for a modern desktop
environment, particularly for multi-channel audio and audio/video
synchronization.

3
audio/esound/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2004/08/05 03:02:01 espie Exp $
@comment $OpenBSD: PLIST,v 1.16 2007/06/26 17:10:29 martynas Exp $
bin/esd
bin/esd-config
bin/esdcat
@ -18,7 +18,6 @@ lib/pkgconfig/esound.pc
@man man/man1/esd.1
@man man/man1/esdcat.1
@man man/man1/esdctl.1
@man man/man1/esddsp.1
@man man/man1/esdfilt.1
@man man/man1/esdloop.1
@man man/man1/esdmon.1