Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9ab204fee9b6fb5480e7e0a2e71cd8058c1b4c29)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9ab204fee9b6fb5480e7e0a2e71cd8058c1b4c29)
  • Date: Sun, 21 May 2017 08:59:49 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

kde5-apps/kaffeine/DEPENDS | 3 ++-
kde5-apps/kaffeine/DETAILS | 7 ++++---
kde5-apps/kaffeine/HISTORY | 4 ++++
libs/gettext/DETAILS | 2 +-
libs/gettext/HISTORY | 3 +++
video/vlc/BUILD | 16 +---------------
video/vlc/DEPENDS | 26 +++++++++-----------------
video/vlc/DETAILS | 15 ++++++++++-----
video/vlc/HISTORY | 11 +++++++++++
video/vlc/PRE_BUILD | 20 +++++++++-----------
video/vlc/TODO | 1 +
video/vlc/configure-qt.patch | 27 ---------------------------
12 files changed, 55 insertions(+), 80 deletions(-)

New commits:
commit 9ab204fee9b6fb5480e7e0a2e71cd8058c1b4c29
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

kaffeine: version 2.0.9

commit a42faa38dfda4cd8f0747ec897aa1b5cbff903d3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlc: version 3.0.0-git-20170520 (a git snapshot that at least builds with
our grimoire)

commit 09ea07b793de8b2b6e9a339ce84f672cb3cb7bb8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gettext: version 0.19.8

commit a396ca39153f8dcfe23aa1d868b1ba17b7c7d0af
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlc: version 2.2.5.1 (still broken with our ffmpeg 3.x)

diff --git a/kde5-apps/kaffeine/DEPENDS b/kde5-apps/kaffeine/DEPENDS
index 0192f23..c42aa53 100755
--- a/kde5-apps/kaffeine/DEPENDS
+++ b/kde5-apps/kaffeine/DEPENDS
@@ -10,4 +10,5 @@ depends solid &&
depends libx11 &&
depends vlc &&
optional_depends v4l-utils '' '' 'DVB digital tv support' &&
-optional_depends kdoctools '' '' 'build documentation'
+# Somehow listed as optional, but configuration requires it.
+depends kdoctools
diff --git a/kde5-apps/kaffeine/DETAILS b/kde5-apps/kaffeine/DETAILS
index 14aa929..b3c10e7 100755
--- a/kde5-apps/kaffeine/DETAILS
+++ b/kde5-apps/kaffeine/DETAILS
@@ -1,7 +1,8 @@
SPELL=kaffeine
- VERSION=2.0.5
-
SOURCE_HASH=sha512:1cd0e7767b649170d19c515361497a1e5a11e3b4bd0cd5dc6bc4ae34617f57c1b3079d952dce84f2c6f64c26ed6a812881365bd129791c9d1034ed57f4d63090
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=2.0.9
+
SOURCE_HASH=sha512:5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7
+# The -1 is there for 2.0.9 for some reason. Check on update.
+ SOURCE=$SPELL-$VERSION-1.tar.xz
SOURCE_URL=http://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://kaffeine.kde.org
diff --git a/kde5-apps/kaffeine/HISTORY b/kde5-apps/kaffeine/HISTORY
index 833faa7..5adb378 100644
--- a/kde5-apps/kaffeine/HISTORY
+++ b/kde5-apps/kaffeine/HISTORY
@@ -1,3 +1,7 @@
+2017-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.0.9
+ * DEPENDS: kdoctools not that optional
+
2016-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.5

diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index 58ed656..b2120db 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,5 +1,5 @@
SPELL=gettext
- VERSION=0.19.7
+ VERSION=0.19.8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index de02840..2c5a8b4 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2017-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 0.19.8
+
2016-01-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.19.7

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index ecbecdf..c8b47e8 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,19 +1,5 @@
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" &&
- CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
-elif test "$(get_spell_provider $SPELL GECKO)" = icecat; then
- OPTS="MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/icecat-config
XPIDL=${INSTALL_ROOT}/usr/lib/icecat/xpidl
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/icecat $OPTS" &&
- CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/seamonkey-config
XPIDL=${INSTALL_ROOT}/usr/lib/seamonkey/xpidl
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/seamonkey $OPTS" &&
- CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/xulrunner-config
XPIDL=${INSTALL_ROOT}/usr/lib/xulrunner/xpidl
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/xulrunner $OPTS" &&
- CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
-fi &&
-
# help configure to find needed QT4 binaries
# if not exported, configure doesn't find them
if is_depends_enabled $SPELL qt4; then
@@ -26,4 +12,4 @@ fi &&
if is_depends_enabled $SPELL goom; then
LDFLAGS=${LDFLAGS/-Wl,--as-needed}
fi &&
-default_build
+BUILDCC=gcc default_build
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index a14d46a..448bd12 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -64,9 +64,10 @@ optional_depends "fribidi" \
"--disable-fribidi" \
"for bidirectional subtitle rendering support" &&

+# No configure switch for GL as such, only GLES v2 …
optional_depends OPENGL \
- "--enable-glx" \
- "--disable-glx" \
+ "" \
+ "" \
"for OpenGL video output" &&

optional_depends "sdl" \
@@ -106,6 +107,11 @@ optional_depends "a52dec" \
"--disable-a52" \
"for AC3 audio decoder" &&

+optional_depends "mpg123" \
+ "--enable-mpg123" \
+ "--disable-mpg123" \
+ "for optimized mp3 decoder" &&
+
optional_depends "libmad" \
"--enable-mad" \
"--disable-mad" \
@@ -218,7 +224,7 @@ optional_depends "libpng" \
"for png snapshot support" &&

optional_depends "live" \
- "--enable-live555 --with-live555-tree=/usr/lib/live" \
+ "--enable-live555" \
"--disable-live555" \
"for rtsp:// protocol support" &&

@@ -238,15 +244,6 @@ optional_depends "libcddb" \
"--disable-libcddb" \
"for CDDB lookup support for audio cds" &&

-optional_depends "vcdimager-unstable" \
- "--enable-vcdx" \
- "--disable-vcdx" \
- "for VCD navigation support" &&
-
-if is_depends_enabled $SPELL vcdimager-unstable; then
- depends libcdio
-fi &&
-
optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
@@ -267,11 +264,6 @@ optional_depends "libgcrypt"
\
"--disable-libgcrypt --disable-remoteosd" \
"for libgcrypt support and RemoteOSD plugin" &&

-optional_depends "gnome-vfs2" \
- "--enable-gnomevfs" \
- "--disable-gnomevfs" \
- "for Gnome VFS input support" &&
-
optional_depends "goom" \
"--enable-goom" \
"--disable-goom" \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index d4e575d..a7ee201 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,12 +1,17 @@
SPELL=vlc
- VERSION=2.2.4
+# Snapshot by sobukus for getting a working vlc build that does work
+# with libs we have in the grimoire.
+ VERSION=3.0.0-git-20170520
SOURCE=$SPELL-$VERSION.tar.xz
+# Switch back to upstream GPG once 3.0.0 is relased.
+
SOURCE_HASH=sha512:7a0d93f8582653050cfe54dd749be8610455deb6afb11d73925e3f89ebbec1c2fa94c9a44828d3b89ed9bb2610f03b1d5dfc3d05f8e6efcb36316bf3f1e19536
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- SOURCE2=$SOURCE.asc
- SOURCE2_IGNORE=signature
- SOURCE_GPG=vlc.gpg:$SOURCE2:UPSTREAM_KEY
+# SOURCE2=$SOURCE.asc
+# SOURCE2_IGNORE=signature
+# SOURCE_GPG=vlc.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
+ SOURCE_URL[0]=http://sobukus.de/$SPELL/$SOURCE
+# SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
WEB_SITE=http://www.videolan.org
LICENSE[0]=GPL
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 08323b6..067ebf4 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,14 @@
+2017-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 3.0.0-git-20170520, a git snapshot that
+ has a chance to build with our ffmpeg and lua (at least)
+ * PRE_BUILD: no mozilla, just lua fixup
+ * BUILD: There is no mozilla plugin. BUILDCC needed.
+ * configure-qt.patch: removed dead patch
+
+2017-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.2.5.1, note: still broken with our
+ ffmpeg spell
+
2016-07-31 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: 2.2.4

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..f009b43 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,11 +1,9 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
- sedit 's:$(libdir)/mozilla:$(libdir)/firefox:' $MOZ_MAKEFILE
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- sedit 's:$(libdir)/mozilla:$(libdir)/seamonkey:' $MOZ_MAKEFILE
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- sedit 's:$(libdir)/mozilla:$(libdir)/xulrunner:' $MOZ_MAKEFILE
-fi
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Deprecation and actual removal of API just to get nicer names
+# should banned, worldwide! Anyhow, it is strange how long vlc
+# development needs to catch up with this, too, given that they
+# _partially_ deal with the Lua API changes already.
+# Grep check is faster than sed over all files.
+find . -type f | xargs grep -m 1 -H luaL_checkint | cut -f 1 -d : \
+| xargs sed -i 's:luaL_checkint( :luaL_checkinteger( :'
diff --git a/video/vlc/TODO b/video/vlc/TODO
new file mode 100644
index 0000000..bec8563
--- /dev/null
+++ b/video/vlc/TODO
@@ -0,0 +1 @@
+configure: WARNING: unrecognized options: --enable-glx, --enable-mkv,
--with-live555-tree, --enable-vcdx
diff --git a/video/vlc/configure-qt.patch b/video/vlc/configure-qt.patch
deleted file mode 100644
index 7e0b57e..0000000
--- a/video/vlc/configure-qt.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig 2015-04-30 10:06:41.747760390 +0200
-+++ configure.ac 2015-04-30 10:08:57.777059790 +0200
-@@ -3718,9 +3718,9 @@
- ])
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
- QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
-- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [])
-+ AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, [])
-+ AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, [])
- ], [
- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
- AS_IF([test -n "${enable_qt}"],[
-@@ -3731,9 +3731,9 @@
- enable_qt="no"
- ])
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [])
- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [])
- ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9ab204fee9b6fb5480e7e0a2e71cd8058c1b4c29), Thomas Orgis, 05/21/2017

Archive powered by MHonArc 2.6.24.

Top of Page