sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 1.1.7.

Browse source 
Put dvb support under the dvbpsi option.

Submitted by:	maintainer (jsa@)
Security:	f9258873-2ee2-11e0-afcd-0015f2db7bde
Feature safe:	yes
This commit is contained in:
Koop Mast 2011-02-02 15:48:01 +00:00
parent 7d33cb0f6d
commit 8dac7557ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=268559
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
multimedia/vlc/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= vlc
DISTVERSION= 1.1.6
DISTVERSION= 1.1.7
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@ -265,10 +265,10 @@ CONFIGURE_ARGS+=--enable-dca
.if defined(WITH_DVBPSI)
LIB_DEPENDS+= dvbpsi.6:${PORTSDIR}/multimedia/libdvbpsi
CONFIGURE_ARGS+=--enable-dvbpsi \
CONFIGURE_ARGS+=--enable-dvb --enable-dvbpsi \
--with-dvbpsi=${LOCALBASE}
.else
CONFIGURE_ARGS+=--disable-dvbpsi
CONFIGURE_ARGS+=--disable-dvb --disable-dvbpsi
.endif
.if defined(WITHOUT_DVDREAD)
@ -613,10 +613,10 @@ CONFIGURE_ARGS+=--disable-upnp
# Video for Linux and DVB (Digital Video Broadcast) support
.if defined(WITHOUT_V4L)
CONFIGURE_ARGS+=--disable-v4l --disable-dvb
CONFIGURE_ARGS+=--disable-v4l
.else
BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
CONFIGURE_ARGS+=--enable-v4l --enable-dvb
CONFIGURE_ARGS+=--enable-v4l
.endif
.if defined(WITHOUT_VCD)

4
multimedia/vlc/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (vlc-1.1.6.tar.bz2) = e797f9fe60cbfc9df7c2cb019c27554213e32230a7beb4a3c6abc5287f069cac
SIZE (vlc-1.1.6.tar.bz2) = 24631857
SHA256 (vlc-1.1.7.tar.bz2) = 28059ef17d0866c3d9d5808fb6bf56783f72486b1b80f7ea8f6106612db0c1d5
SIZE (vlc-1.1.7.tar.bz2) = 24635812

20
multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c
View file

@ -1,24 +1,24 @@
--- ./modules/misc/inhibit/xdg.c.orig 2010-07-10 19:56:31.000000000 -0400
+++ ./modules/misc/inhibit/xdg.c 2010-07-10 20:07:33.000000000 -0400
@@ -25,7 +25,6 @@
#include <vlc_common.h>
--- ./modules/misc/inhibit/xdg.c.orig 2011-02-02 06:49:43.000000000 -0500
+++ ./modules/misc/inhibit/xdg.c 2011-02-02 06:50:22.000000000 -0500
@@ -26,7 +26,6 @@
#include <vlc_plugin.h>
#include <vlc_inhibit.h>
#include <assert.h>
-#include <spawn.h>
#include <sys/wait.h>
static int Open (vlc_object_t *);
@@ -123,19 +122,9 @@
@@ -134,19 +133,10 @@
id,
NULL,
};
- pid_t pid;
int canc = vlc_savecancel ();
vlc_mutex_unlock (&p_sys->lock);
- if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ))
- {
- int status;
-
- msg_Dbg (ih, "started xdg-screensaver (PID = %d)", (int)pid);
- /* Wait for command to complete */
- while (waitpid (pid, &status, 0) == -1);
@ -26,6 +26,6 @@
- else/* We don't handle the error, but busy looping would be worse :( */
- msg_Warn (ih, "could not start xdg-screensaver");
+ msg_Warn (ih, "could not start xdg-screensaver");
suspended = !suspended;
vlc_restorecancel (canc);
}
vlc_mutex_lock (&p_sys->lock);
p_sys->suspended = p_sys->suspend;