mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Remove esound support from the ports tree, as audio/esound expired.

Browse Source
This commit is contained in:
Rene Ladan 2019-05-08 12:54:13 +00:00
parent 37855fb2c7
commit dfd801cad1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=501020
21 changed files with 5 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MOVED
View File

@ -12214,3 +12214,5 @@ devel/py-jsonschema2|devel/py-jsonschema|2019-05-01|Has expired: Use devel/py-js
devel/rubygem-msgpack1|devel/rubygem-msgpack|2019-05-01|Has expired: Use devel/rubygem-msgpack instead
www/p5-CGI.pm|www/p5-CGI|2019-05-01|Has expired: Use www/p5-CGI instead
math/rpy|math/py-rpy|2019-04-03|Moved to correct directory, this is a python library
audio/esound||2019-05-08|Has expired: Abandonware
audio/gstreamer-plugins-esound||2019-05-08|Has expired: Depends on audio/esound

1
Mk/Scripts/qa.sh
View File

@ -363,7 +363,6 @@ proxydeps_suggest_uses() {
${pkg} = "graphics/cairo" -o \
${pkg} = "graphics/cairomm" -o \
${pkg} = "devel/dconf" -o \
${pkg} = "audio/esound" -o \
${pkg} = "devel/gconf2" -o \
${pkg} = "devel/gconfmm26" -o \
${pkg} = "devel/glib20" -o \

7
Mk/Uses/gnome.mk
View File

@ -67,7 +67,7 @@ IGNORE= USES=gnome takes no arguments
.endif
# non-version specific components
_USE_GNOME_ALL= esound intlhack intltool introspection \
_USE_GNOME_ALL= intlhack intltool introspection \
referencehack gnomemimedata \
gnomeprefix
@ -165,11 +165,6 @@ libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20
pangomm_LIB_DEPENDS= libpangomm-1.4.so:x11-toolkits/pangomm
pangomm_USE_GNOME_IMPL= pango glibmm cairomm
ESD_CONFIG?= ${LOCALBASE}/bin/esd-config
esound_LIB_DEPENDS= libesd.so:audio/esound
esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}"
esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}"
gnomemimedata_BUILD_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
gnomemimedata_RUN_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data

4
Mk/bsd.gstreamer.mk
View File

@ -121,7 +121,6 @@ _GSTREAMER_PLUGINS+= \
bz2 \
cdaudio \
dvd \
esound \
ffmpeg \
fluendo-mp3 \
fluendo-mpegdemux \
@ -226,9 +225,6 @@ cdparanoia_IMPL= #
chromaprint_DEPENDS= audio/gstreamer-plugins-chromaprint
chromeprint_IMPL= bad
esound_DEPENDS= audio/gstreamer-plugins-esound
esound_IMPL= good
faac_DEPENDS= audio/gstreamer-plugins-faac
faac_IMPL= bad

1
Mk/bsd.options.desc.mk
View File

@ -78,7 +78,6 @@ DTRACE_DESC?= Build with DTrace probes
DV_DESC?= Quasar DV video codec support (libdv)
DVDCSS_DESC?= Encrypted DVD support via libdvdcss
ECW_DESC?= ECW image format support
ESOUND_DESC?= EsounD sound server support
EXAMPLES_DESC?= Build and/or install examples
EXIV2_DESC?= EXIF and IPTC metadata support via exiv2
EXPAT_DESC?= XML parser support via Expat

2
audio/Makefile
View File

@ -133,7 +133,6 @@
SUBDIR += enscribe
SUBDIR += epos-devel
SUBDIR += eq10q-lv2
SUBDIR += esound
SUBDIR += espeak
SUBDIR += espressivo-lv2
SUBDIR += etcd
@ -249,7 +248,6 @@
SUBDIR += gstreamer-plugins-amrwbdec
SUBDIR += gstreamer-plugins-cdaudio
SUBDIR += gstreamer-plugins-cdparanoia
SUBDIR += gstreamer-plugins-esound
SUBDIR += gstreamer-plugins-faac
SUBDIR += gstreamer-plugins-faad
SUBDIR += gstreamer-plugins-flac

36
audio/esound/Makefile
View File

@ -1,36 +0,0 @@
# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/audio/esound/Makefile,v 1.1 2008/11/20 19:38:24 marcus Exp $
PORTNAME= esound
PORTVERSION= 0.2.41
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Sound library for enlightenment package
LIB_DEPENDS= libaudiofile.so:audio/libaudiofile
DEPRECATED= Abandonware
EXPIRATION_DATE= 2019-03-25
USES= alias libtool:keepla pathfix pkgconfig:both tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= JW=false
INSTALL_TARGET= install-strip
CONFLICTS= py*-ro-[0-9]*
post-patch:
@${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \
-e '/^esd_LDADD =/s/$$/ -lm/' \
${WRKSRC}/Makefile.in
post-install:
${INSTALL_DATA} ${WRKSRC}/esd.conf ${STAGEDIR}${PREFIX}/etc/esd.conf.sample
.include <bsd.port.mk>

2
audio/esound/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (gnome/esound-0.2.41.tar.bz2) = 5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911
SIZE (gnome/esound-0.2.41.tar.bz2) = 396474

20
audio/esound/files/patch-Makefile.in
View File

@ -1,20 +0,0 @@
--- Makefile.in.orig 2008-07-17 13:45:22.000000000 -0400
+++ Makefile.in 2008-07-17 13:45:46.000000000 -0400
@@ -342,7 +342,7 @@ bin_SCRIPTS = \
lib_LTLIBRARIES = libesd.la $(libesddsp_la)
libesd_la_CFLAGS = $(AM_CFLAGS)
-libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined
+libesd_la_LDFLAGS = -version-info 2:0:0 -no-undefined
libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
libesd_la_SOURCES = \
esdlib.c \
@@ -373,7 +373,7 @@ AUDIO_BACKENDS = \
audio_solaris.c \
audio_win32.c
-libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
+libesddsp_la_LDFLAGS = -version-info 2:0:0
libesddsp_la_LIBADD = libesd.la $(DL_LIB) -lm
libesddsp_la_SOURCES = \
esddsp.c

18
audio/esound/files/patch-audio__oss.c
View File

@ -1,18 +0,0 @@
--- audio_oss.c.orig 2008-07-29 14:07:50.000000000 -0400
+++ audio_oss.c 2008-09-07 22:22:15.000000000 -0400
@@ -12,8 +13,14 @@
#include <errno.h>
+#if defined(__sparc__) || defined(__powerpc__)
+#define AFMT_S16_NE AFMT_S16_BE
+#else
+#define AFMT_S16_NE AFMT_S16_LE
+#endif
+
/* FreeBSD uses a different identifier? what other BSDs? */
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifndef SNDCTL_DSP_SETDUPLEX
#define SNDCTL_DSP_SETDUPLEX DSP_CAP_DUPLEX
#endif

15
audio/esound/files/patch-esd.c
View File

@ -1,15 +0,0 @@
--- esd.c.orig Tue Nov 28 13:27:30 2000
+++ esd.c Fri Dec 1 15:12:41 2000
@@ -212,8 +212,8 @@
#define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
- S_IRGRP|S_IWGRP|S_IXGRP|\
- S_IROTH|S_IWOTH|S_IXOTH|S_ISVTX)
+ S_IRGRP|S_IXGRP|\
+ S_IROTH|S_IXOTH|S_ISVTX)
#else
#define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
- S_IRGRP|S_IWGRP|S_IXGRP|\
- S_IROTH|S_IWOTH|S_IXOTH)
+ S_IRGRP|S_IXGRP|\
+ S_IROTH|S_IXOTH)
#endif

85
audio/esound/files/patch-esddsp.c
View File

@ -1,85 +0,0 @@
--- esddsp.c.orig 2008-11-18 15:35:19.000000000 -0500
+++ esddsp.c 2008-11-20 14:35:02.000000000 -0500
@@ -70,6 +70,7 @@
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__)
typedef unsigned long request_t;
+typedef off_t off64_t;
#else
typedef int request_t;
#endif
@@ -228,16 +229,19 @@ open_wrapper (int (*func) (const char *,
const char *pathname, int flags, ...)
{
va_list args;
- mode_t mode;
+ mode_t mode = 0;
dsp_init ();
- va_start (args, flags);
- if (sizeof (mode_t) < sizeof (int))
+ if ((flags & O_CREAT) != 0)
+ {
+ va_start (args, flags);
+ if (sizeof (mode_t) < sizeof (int))
mode = va_arg (args, int);
- else
+ else
mode = va_arg (args, mode_t);
- va_end (args);
+ va_end (args);
+ }
if (!strcmp (pathname, "/dev/dsp"))
{
@@ -268,7 +272,7 @@ open (const char *pathname, int flags, .
{
static int (*func) (const char *, int, mode_t) = NULL;
va_list args;
- mode_t mode;
+ mode_t mode = 0;
DPRINTF ("open\n");
@@ -283,9 +287,12 @@ open (const char *pathname, int flags, .
}
}
- va_start (args, flags);
- mode = va_arg (args, mode_t);
- va_end (args);
+ if ((flags & O_CREAT) != 0)
+ {
+ va_start (args, flags);
+ mode = va_arg (args, mode_t);
+ va_end (args);
+ }
return open_wrapper(func, pathname, flags, mode);
}
@@ -295,7 +302,7 @@ open64 (const char *pathname, int flags,
{
static int (*func) (const char *, int, mode_t) = NULL;
va_list args;
- mode_t mode;
+ mode_t mode = 0;
DPRINTF ("open64\n");
@@ -310,9 +317,12 @@ open64 (const char *pathname, int flags,
}
}
- va_start (args, flags);
- mode = va_arg (args, mode_t);
- va_end (args);
+ if ((flags & O_CREAT) != 0)
+ {
+ va_start (args, flags);
+ mode = va_arg (args, mode_t);
+ va_end (args);
+ }
return open_wrapper(func, pathname, flags, mode);
}

11
audio/esound/files/patch-esddsp.in
View File

@ -1,11 +0,0 @@
--- esddsp.in.orig 2008-07-15 12:05:18.000000000 -0400
+++ esddsp.in 2008-07-17 13:54:49.000000000 -0400
@@ -106,7 +106,7 @@ fi
prefix=@prefix@
exec_prefix=@exec_prefix@
-LD_PRELOAD="libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
+LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD"
export LD_PRELOAD
# invoke the program with the args given

55
audio/esound/files/patch-esdlib.c
View File

@ -1,55 +0,0 @@
--- esdlib.c.orig 2008-11-18 15:35:19.000000000 -0500
+++ esdlib.c 2008-11-20 14:32:59.000000000 -0500
@@ -21,6 +21,8 @@
#include <errno.h>
#include <sys/wait.h>
#include <poll.h>
+#include <pwd.h>
+#include <limits.h>
#include <sys/un.h>
@@ -928,7 +930,7 @@ int esd_open_sound( const char *rhost )
putenv(preload2);
}
cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 9999999999") + strlen(esd_spawn_options));
- sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options, esd_pipe[1]);
+ sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]);
if(!fork()) {
/* child of child process. Minimal so startup overhead is
@@ -1747,3 +1749,34 @@ int esd_close( int esd )
return close( esd );
}
+char *
+esd_unix_socket_dir(void) {
+ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
+ struct passwd *pw;
+
+ if (sockdir != NULL)
+ return (sockdir);
+ pw = getpwuid(getuid());
+ if (pw == NULL || pw->pw_dir == NULL) {
+ fprintf(stderr, "esd: could not find home directory\n");
+ exit(1);
+ }
+ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir);
+ endpwent();
+ sockdir = sockdirbuf;
+ return (sockdir);
+}
+
+char *
+esd_unix_socket_name(void) {
+ static char *sockname = NULL, socknamebuf[PATH_MAX];
+
+ if (sockname != NULL)
+ return (sockname);
+ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket",
+ esd_unix_socket_dir());
+ sockname = socknamebuf;
+ return (sockname);
+ }
+
+

62
audio/esound/files/patch-esound-increase-timeouts
View File

@ -1,62 +0,0 @@
libesd cannot connect to server if it work on slow hardware and/or on windows due to
extremely small default read/write timeout = 100ms This patch increases them up to 300ms.
--- esdlib.c.org 2008-11-18 23:35:19.000000000 +0300
+++ esdlib.c 2011-04-29 21:58:56.698001331 +0400
@@ -30,6 +30,11 @@
+ strlen ((ptr)->sun_path))
#endif
+#define TCP_CONNECT_TIMEOUT 1000
+#define UNIX_CONNECT_TIMEOUT 100
+#define SOCKET_READ_TIMEOUT 300
+#define SOCKET_WRITE_TIMEOUT 300
+
/*******************************************************************/
/* prototypes */
int esd_set_socket_buffers( int sock, int src_format,
@@ -89,7 +94,7 @@
do {
pfd[0].revents = 0;
- rv = poll (pfd, 1, 100);
+ rv = poll (pfd, 1, SOCKET_READ_TIMEOUT);
} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
if (rv < 1 || !(pfd[0].revents & POLLIN)) {
@@ -137,7 +142,7 @@
do {
pfd[0].revents = 0;
- rv = poll (pfd, 1, 100);
+ rv = poll (pfd, 1, SOCKET_WRITE_TIMEOUT);
} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
if (rv < 1 || (pfd[0].revents & (POLLERR | POLLHUP | POLLOUT)) != POLLOUT) {
@@ -641,7 +646,7 @@
goto error_out;
}
- if ( connect_timeout ( socket_out, res->ai_addr, res->ai_addrlen, 1000 ) != -1 )
+ if ( connect_timeout ( socket_out, res->ai_addr, res->ai_addrlen, TCP_CONNECT_TIMEOUT ) != -1 )
break;
close ( socket_out );
@@ -727,7 +732,7 @@
if ( connect_timeout ( socket_out,
(struct sockaddr *) &socket_addr,
- sizeof(struct sockaddr_in), 1000 ) < 0 )
+ sizeof(struct sockaddr_in), TCP_CONNECT_TIMEOUT ) < 0 )
goto error_out;
}
@@ -779,7 +784,7 @@
socket_unix.sun_family = AF_UNIX;
strncpy(socket_unix.sun_path, ESD_UNIX_SOCKET_NAME, sizeof(socket_unix.sun_path));
- if ( connect_timeout ( socket_out, (struct sockaddr *) &socket_unix, SUN_LEN(&socket_unix), 100 ) < 0 )
+ if ( connect_timeout ( socket_out, (struct sockaddr *) &socket_unix, SUN_LEN(&socket_unix), UNIX_CONNECT_TIMEOUT ) < 0 )
goto error_out;
return socket_out;

13
audio/esound/pkg-descr
View File

@ -1,13 +0,0 @@
[From the EsounD website:]
[W]hen two or more applications want to play sounds at the same time,
it's on a first-come, first-served basis. Whoever gets to the audio
device first wins. EsounD changes all of that...
The Enlightened Sound Daemon mixes several audio streams for playback by
a single audio device. You can also pre-load samples, and play them back
without having to send all the data for the sound. Network transparency
is also built in, so you can play sounds on one machine, and listen to
them on another.
WWW: http://www.tux.org/~ricdude/EsounD.html

6
audio/esound/pkg-message
View File

@ -1,6 +0,0 @@
The ESounD daemon (esd) must be started on a per-user basis. This is typically
done by the Session Manager in GNOME. However, if you are not using the
GNOME Desktop, you will need to add something like the following to your
X Windows initialization script:
esd -terminate -nobeeps -as 2

36
audio/esound/pkg-plist
View File

@ -1,36 +0,0 @@
bin/esd
bin/esd-config
bin/esdcat
bin/esdctl
bin/esddsp
bin/esdfilt
bin/esdloop
bin/esdmon
bin/esdplay
bin/esdrec
bin/esdsample
@sample etc/esd.conf.sample
include/esd.h
lib/libesd.a
lib/libesd.la
lib/libesd.so
lib/libesd.so.2
lib/libesd.so.2.0.0
lib/libesddsp.a
lib/libesddsp.la
lib/libesddsp.so
lib/libesddsp.so.2
lib/libesddsp.so.2.0.0
libdata/pkgconfig/esound.pc
man/man1/esd-config.1.gz
man/man1/esd.1.gz
man/man1/esdcat.1.gz
man/man1/esdctl.1.gz
man/man1/esddsp.1.gz
man/man1/esdfilt.1.gz
man/man1/esdloop.1.gz
man/man1/esdmon.1.gz
man/man1/esdplay.1.gz
man/man1/esdrec.1.gz
man/man1/esdsample.1.gz
share/aclocal/esd.m4

17
audio/gstreamer-plugins-esound/Makefile
View File

@ -1,17 +0,0 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/audio/gstreamer-plugins-esound/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $
PORTREVISION= 2
CATEGORIES= audio
COMMENT= Gstreamer enlightenment sound library plugin
DEPRECATED= Depends on audio/esound
EXPIRATION_DATE= 2019-03-25
GST_PLUGIN= esound
MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
.include "${MASTERDIR}/Makefile"

4
multimedia/gstreamer-plugins/Makefile
View File

@ -6,7 +6,7 @@ PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}.
PORTREVISION?= 11
PORTREVISION?= 12
PORTEPOCH= 3
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@ -45,8 +45,8 @@ DIST?= good
SHLIB_VERSION= 1
VERSION= ${GST_VERSION}
WANT_GSTREAMER= yes
USES= gettext gmake gnome libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
USE_GNOME+= introspection:build
USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
GNU_CONFIGURE= yes
GST_PLUGIN?= base
INSTALL_TARGET= install-strip

10
multimedia/gstreamer-plugins/Makefile.common
View File

@ -73,7 +73,6 @@ GOOD_GST_ALL_PLUGINS+= \
annodex \
cairo \
dv \
esd \
flac \
gconf \
gdk_pixbuf \
@ -249,15 +248,6 @@ gst_dvd_PLIST_FILES= ${GST_LIB_DIR}/libgstdvdread.la \
${GST_LIB_DIR}/libgstdvdread.so
gst_dvd_DIST= ugly
# esound
gst_esound_USE_GNOME+= esound
gst_esound_GST_PLUGIN_DIR= ext/esd
gst_esound_CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
ESD_LIBS="`pkg-config --libs esound`"
gst_esound_PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
${GST_LIB_DIR}/libgstesd.la
# exif
# hmm not a real plugin, seems to be part of metadata?
#gst_exif_LIB_DEPENDS+= libexif.so:graphics/libexif