mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-27 10:03:20 +00:00
Update to 2.0.5 .
Thanx to: several people on -multimedia for testing and feedback
This commit is contained in:
Juergen Lock
parent
dacc956327
commit
d31c6d5755
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=309447
@ -2,9 +2,8 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= vlc
|
||||
DISTVERSION= 2.0.4
|
||||
DISTVERSION= 2.0.5
|
||||
PORTEPOCH= 3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= multimedia audio ipv6 net www
|
||||
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \
|
||||
http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION}/ \
|
||||
@ -29,11 +28,11 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \
|
||||
SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SQLITE SVG \
|
||||
TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \
|
||||
X11 X264 XCB XOSD XVIDEO ZVBI SERVER_ONLY DEBUG \
|
||||
NO_DVD
|
||||
NO_DVD LIBBLURAY SAMPLERATE
|
||||
OPTIONS_DEFAULT=A52 AVAHI DBUS DTS DVDREAD DVDNAV FAAD FLAC GLX GNUTLS \
|
||||
HTTPD LUA MAD MATROSKA MPEG2 OGG OPUS PNG QT4 REALAUDIO \
|
||||
SDL SKINS STREAM SPEEX TAGLIB THEORA TWOLAME V4L \
|
||||
VCD VORBIS X11 X264 XCB XVIDEO
|
||||
VCD VORBIS X11 X264 XCB XVIDEO SAMPLERATE
|
||||
ASS_DESC= ASS/SSA subtitle rendering
|
||||
DTS_DESC= DTS DVD audio decoder
|
||||
DVDREAD_DESC= DVD Playback support
|
||||
@ -274,10 +273,10 @@ CONFIGURE_ARGS+=--disable-glx
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MGNOMEVFS}
|
||||
USE_GNOME= gnomevfs2
|
||||
USE_GNOME+= gnomevfs2
|
||||
CONFIGURE_ARGS+=--enable-gnomevfs
|
||||
.else
|
||||
COFIGURE_ARGS+=--disable-gnomevfs
|
||||
CONFIGURE_ARGS+=--disable-gnomevfs
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MGNUTLS}
|
||||
@ -307,6 +306,13 @@ CONFIGURE_ARGS+=--enable-jack
|
||||
CONFIGURE_ARGS+=--disable-jack
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MLIBBLURAY}
|
||||
LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray
|
||||
CONFIGURE_ARGS+=--enable-bluray
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-bluray
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MLIRC}
|
||||
CONFIGURE_ARGS+=--enable-lirc
|
||||
LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
|
||||
@ -408,11 +414,12 @@ CONFIGURE_ARGS+=--enable-optimizations
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MOGG}
|
||||
LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg
|
||||
CONFIGURE_ARGS+=--enable-ogg
|
||||
LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg \
|
||||
kate:${PORTSDIR}/multimedia/libkate
|
||||
CONFIGURE_ARGS+=--enable-ogg --enable-kate
|
||||
.else
|
||||
PORT_OPTIONS:= ${PORT_OPTIONS:NVORBIS}
|
||||
CONFIGURE_ARGS+=--disable-ogg
|
||||
CONFIGURE_ARGS+=--disable-ogg --disable-kate
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MOPUS}
|
||||
@ -463,6 +470,13 @@ CONFIGURE_ARGS+=--disable-real --disable-realrtsp
|
||||
CONFIGURE_ARGS+=--enable-run-as-root
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MSAMPLERATE}
|
||||
LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate
|
||||
CONFIGURE_ARGS+=--enable-samplerate
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-samplerate
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MSAMBA}
|
||||
LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
|
||||
CONFIGURE_ARGS+=--enable-smb
|
||||
@ -584,6 +598,7 @@ CONFIGURE_ARGS+=--disable-libva
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MVCD}
|
||||
LIB_DEPENDS+= cddb:${PORTSDIR}/audio/libcddb
|
||||
CONFIGURE_ARGS+=--enable-vcd --enable-libcddb
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-vcd --disable-libcddb
|
||||
@ -770,7 +785,7 @@ pre-install:
|
||||
.if ${PORT_OPTIONS:MNLS}
|
||||
cd ${FAKEDIR}/share/locale && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|share/locale/|' >> ${PLIST}
|
||||
.for locale in ach cgg bn_IN ckb co ff fur gd kk km kmr lg my oc ps tet tl zu
|
||||
.for locale in ach cgg bn_IN ckb co ff fur gd ia kk km kmr lg my oc ps tet tl zu
|
||||
${ECHO_CMD} "@dirrmtry share/locale/${locale}/LC_MESSAGES" >> ${PLIST}
|
||||
${ECHO_CMD} "@dirrmtry share/locale/${locale}" >> ${PLIST}
|
||||
.endfor
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (vlc-2.0.4.tar.xz) = 4e066ed0d48ddc85aa1f01964945af666b5713cb6230d76347aebbc9a6553db6
|
||||
SIZE (vlc-2.0.4.tar.xz) = 18518272
|
||||
SHA256 (vlc-2.0.5.tar.xz) = dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e
|
||||
SIZE (vlc-2.0.5.tar.xz) = 18369292
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- modules/access/dtv/linux.c.orig
|
||||
+++ modules/access/dtv/linux.c
|
||||
@@ -173,7 +173,14 @@ static int dvb_open_adapter (uint8_t ada
|
||||
char dir[20];
|
||||
|
||||
snprintf (dir, sizeof (dir), "/dev/dvb/adapter%"PRIu8, adapter);
|
||||
+#ifdef O_CLOEXEC
|
||||
return open (dir, O_SEARCH|O_DIRECTORY|O_CLOEXEC);
|
||||
+#else
|
||||
+ int fd = open (dir, O_SEARCH|O_DIRECTORY);
|
||||
+ if (fd != -1)
|
||||
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
|
||||
+ return fd;
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** Opens the DVB device node of the specified type */
|
||||
@@ -183,7 +190,13 @@ static int dvb_open_node (dvb_device_t *
|
||||
char path[strlen (type) + 4];
|
||||
|
||||
snprintf (path, sizeof (path), "%s%u", type, d->device);
|
||||
+#ifdef O_CLOEXEC
|
||||
fd = openat (d->dir, path, flags|O_CLOEXEC);
|
||||
+#else
|
||||
+ fd = openat (d->dir, path, flags);
|
||||
+ if (fd != -1)
|
||||
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
|
||||
+#endif
|
||||
if (fd != -1)
|
||||
fcntl (fd, F_SETFL, fcntl (fd, F_GETFL) | O_NONBLOCK);
|
||||
return fd;
|
||||
@ -1,32 +0,0 @@
|
||||
--- modules/audio_output/vlcpulse.c.orig
|
||||
+++ modules/audio_output/vlcpulse.c
|
||||
@@ -113,10 +113,12 @@ pa_context *vlc_pa_connect (vlc_object_t
|
||||
struct passwd pwbuf, *pw;
|
||||
char buf[len];
|
||||
|
||||
- if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0
|
||||
- && pw != NULL)
|
||||
- pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
|
||||
- pw->pw_name);
|
||||
+ if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0) {
|
||||
+ if (pw != NULL)
|
||||
+ pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_USER,
|
||||
+ pw->pw_name);
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
for (size_t max = sysconf (_SC_HOST_NAME_MAX), len = max % 1024 + 1024;
|
||||
@@ -124,9 +126,11 @@ pa_context *vlc_pa_connect (vlc_object_t
|
||||
{
|
||||
char hostname[len];
|
||||
|
||||
- if (gethostname (hostname, sizeof (hostname)) == 0)
|
||||
+ if (gethostname (hostname, sizeof (hostname)) == 0) {
|
||||
pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_HOST,
|
||||
hostname);
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
const char *session = getenv ("XDG_SESSION_COOKIE");
|
||||
Loading…
Reference in New Issue
Block a user