Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (51d81f48a07a1ebab232db93d2c5fa5aa2759379)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (51d81f48a07a1ebab232db93d2c5fa5aa2759379)
  • Date: Sun, 19 Apr 2015 08:12:15 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

video/vlc/BUILD | 20 ++++++--------------
video/vlc/CONFIGURE | 1 -
video/vlc/DEPENDS | 36 +++++++++++-------------------------
video/vlc/DETAILS | 2 +-
video/vlc/HISTORY | 10 ++++++++++
5 files changed, 28 insertions(+), 41 deletions(-)

New commits:
commit 51d81f48a07a1ebab232db93d2c5fa5aa2759379
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vlc - tidy up DEPENDS, BUILD

commit 3ca0c2f1deca49e687f73e2dfbf8230202ea106e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vlc: => 2.2.1

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 739ebf9..ecbecdf 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,9 +1,4 @@
-OPTS="--disable-dependency-tracking --disable-macosx-defaults $OPTS" &&
-
-if [ "$V4L" = "y" ]; then
- OPTS="--enable-v4l $OPTS"
-fi &&
-
+OPTS="--disable-dependency-tracking $OPTS" &&

if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
OPTS="MOZILLA_CONFIG=${INSTALL_ROOT}/usr/lib/firefox/firefox-config
XPIDL=${INSTALL_ROOT}/usr/lib/firefox/
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/firefox $OPTS" &&
@@ -22,16 +17,13 @@ fi &&
# help configure to find needed QT4 binaries
# if not exported, configure doesn't find them
if is_depends_enabled $SPELL qt4; then
- export MOC="${INSTALL_ROOT}/usr/bin/qt4/moc"
- export RCC="${INSTALL_ROOT}/usr/bin/qt4/rcc"
- export UIC="${INSTALL_ROOT}/usr/bin/qt4/uic"
+ export PKG_CONFIG_PATH=$QT4DIR/lib/pkgconfig
+fi &&
+if is_depends_enabled $SPELL qtbase; then
+ export PKG_CONFIG_PATH=$QT5DIR/lib/pkgconfig
fi &&

if is_depends_enabled $SPELL goom; then
LDFLAGS=${LDFLAGS/-Wl,--as-needed}
fi &&
-
-default_build &&
-
-export -n MOC RCC UIC &&
-unset MOC RCC UIC
+default_build
diff --git a/video/vlc/CONFIGURE b/video/vlc/CONFIGURE
deleted file mode 100755
index 60e3a59..0000000
--- a/video/vlc/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query V4L "Enable Video4Linux input support?" y
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 2084bca..ee34b65 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -1,30 +1,21 @@
+depends zlib
optional_depends gettext '' '--disable-nls' 'Natural Language support' &&
# interface options
-optional_depends "qt4" \
- "--enable-qt4" \
- "--disable-qt4 --disable-skins2" \
- "for qt4 interface" &&
+optional_depends "QT" \
+ "--enable-qt" \
+ "--disable-qt --disable-skins2" \
+ "for Qt interface" &&

optional_depends "ncurses" \
"--enable-ncurses" \
"--disable-ncurses" \
"for ncurses interface" &&

-optional_depends "xosd" \
- "--enable-xosd" \
- "--disable-xosd" \
- "for xosd interface" &&
-
optional_depends "lua" \
"--enable-lua" \
"--disable-lua" \
"for interface plugins" &&

-optional_depends "libproxy" \
- "--enable-libproxy" \
- "--disable-libproxy" \
- "for proxy configuration through libproxy" &&
-
optional_depends "libsamplerate" \
"--enable-samplerate" \
"--disable-samplerate" \
@@ -114,9 +105,9 @@ optional_depends "libmad" \
"--disable-mad" \
"for fixed point mp3 decoder" &&

-optional_depends "libid3tag" \
- "--enable-id3tag" \
- "--disable-id3tag" \
+optional_depends "taglib" \
+ "--enable-taglib" \
+ "--disable-taglib" \
"for id3 tag reading support" &&

optional_depends "libvorbis" \
@@ -157,7 +148,7 @@ optional_depends libmpeg2 \

optional_depends LIBAVCODEC \
"--enable-avcodec" \
- "--disable-avcodec --disable-avformat --disable-postproc"
\
+ "--disable-avcodec --disable-avformat --disable-postproc
--disable-swscale" \
"for lots of video codecs" &&

if is_depends_enabled $SPELL ffmpeg; then
@@ -184,11 +175,6 @@ optional_depends "x264" \
"--disable-x264" \
"for h264 encoding support" &&

-optional_depends "dirac" \
- "--enable-dirac" \
- "--disable-dirac" \
- "for Dirac video support" &&
-
optional_depends "schroedinger" \
"--enable-schroedinger" \
"--disable-schroedinger" \
@@ -306,8 +292,8 @@ optional_depends "libass" \
"for subtitle rendering" &&

optional_depends "samba" \
- "--enable-smb" \
- "--disable-smb" \
+ "--enable-smbclient" \
+ "--disable-smbclient" \
"for SMB/CIFS support" &&

optional_depends "resid" \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index f8533cd..8e4ed60 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=2.1.5
+ VERSION=2.2.1
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE2=$SOURCE.asc
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 7c85749..2270b30 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,13 @@
+2015-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.2.1
+ * DEPENDS,BUILD: add qt4/qt5 support
+ * BUILD: remove v4l support, obsolete macosx option
+ * CONFIGURE: deleted
+ * DEPENDS: add zlib
+ delete libproxy, xosd, dirac
+ id3tag => taglib
+ smb => --enable-smbclient
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (51d81f48a07a1ebab232db93d2c5fa5aa2759379), Treeve Jelbert, 04/19/2015

Archive powered by MHonArc 2.6.24.

Top of Page