pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vlc: Fix build with all options turned on
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Mar 20 17:01:40 2018 +0100
Changeset: 2e48be02829d71e78874ee5c8ae1dfdd4c3a9987
Modified Files:
vlc/Makefile
vlc/PLIST
vlc/distinfo
vlc/options.mk
Added Files:
vlc/patches/patch-share_Makefile.am
Log Message:
vlc: Fix build with all options turned on
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e48be02829d71e78874ee5c8ae1dfdd4c3a9987
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vlc/Makefile | 2 +-
vlc/PLIST | 2 +-
vlc/distinfo | 1 +
vlc/options.mk | 2 +-
vlc/patches/patch-share_Makefile.am | 13 +++++++++++++
5 files changed, 17 insertions(+), 3 deletions(-)
diffs:
diff --git a/vlc/Makefile b/vlc/Makefile
index 685661ed0d..2a7160b79c 100644
--- a/vlc/Makefile
+++ b/vlc/Makefile
@@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2
CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl pkg-config autoreconf autoconf automake bison autopoint realpath
+USE_TOOLS+= gmake perl pkg-config autoreconf autoconf automake bison autopoint realpath msgfmt
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/vlc/PLIST b/vlc/PLIST
index bac626ad87..8098f3b5c5 100644
--- a/vlc/PLIST
+++ b/vlc/PLIST
@@ -121,6 +121,7 @@ lib/libvlc.la
lib/libvlccore.la
lib/pkgconfig/libvlc.pc
lib/pkgconfig/vlc-plugin.pc
+${PLIST.pulseaudio}lib/vlc/libvlc_pulse.la
${PLIST.x11}lib/vlc/libvlc_vdpau.la
${PLIST.x11}lib/vlc/libvlc_xcb_events.la
lib/vlc/lua/extensions/VLSub.luac
@@ -172,7 +173,6 @@ lib/vlc/plugins/access/libdvdnav_plugin.la
lib/vlc/plugins/access/libdvdread_plugin.la
lib/vlc/plugins/access/libfilesystem_plugin.la
lib/vlc/plugins/access/libftp_plugin.la
-${PLIST.gnome}lib/vlc/plugins/access/libgnomevfs_plugin.la
lib/vlc/plugins/access/libhttp_plugin.la
lib/vlc/plugins/access/libhttps_plugin.la
lib/vlc/plugins/access/libidummy_plugin.la
diff --git a/vlc/distinfo b/vlc/distinfo
index cae2c39a9c..b50322e4bd 100644
--- a/vlc/distinfo
+++ b/vlc/distinfo
@@ -11,3 +11,4 @@ SHA1 (patch-lib_video.c) = 6d6b46f46bc103a7548bf1dae84e76b57ba7aa5d
SHA1 (patch-m4_dolt.m4) = f567605ca51069a681516016066ef0009787c904
SHA1 (patch-modules_access_http_Makefile.am) = 1c28d851d4aae5007dc89511975d9c9f1c39c944
SHA1 (patch-modules_codec_x264.c) = 7fd2fd2801b4a4f35e67bca8766b42a17528d503
+SHA1 (patch-share_Makefile.am) = d0b31ec5414382dbf93456bdeb24c1069d21f1d3
diff --git a/vlc/options.mk b/vlc/options.mk
index 561183e84b..8f629a0f81 100644
--- a/vlc/options.mk
+++ b/vlc/options.mk
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.32 2017/05/15 11:07:20 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= dbus debug dts faad gnome jack live pulseaudio
+PKG_SUPPORTED_OPTIONS= dbus debug dts faad jack live pulseaudio
PKG_SUPPORTED_OPTIONS+= vlc-skins x11
PKG_SUGGESTED_OPTIONS= dbus x11
diff --git a/vlc/patches/patch-share_Makefile.am b/vlc/patches/patch-share_Makefile.am
new file mode 100644
index 0000000000..b3ba3b365e
--- /dev/null
+++ b/vlc/patches/patch-share_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- share/Makefile.am.orig 2018-02-06 18:41:06.000000000 +0000
++++ share/Makefile.am
+@@ -94,7 +94,7 @@ skins2/default.vlt: $(skins2_default_vlt
+ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
+ $(AM_V_GEN)GZIP=--no-name \
+ tar cvvzf skins2/default.vlt.tmp \
+- --owner=root --group=root --directory="$(srcdir)/skins2" \
++ --directory="$(srcdir)/skins2" \
+ default/
+ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
+
Home |
Main Index |
Thread Index |
Old Index