summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--video/vlc/HISTORY3
-rwxr-xr-xvideo/vlc/PRE_BUILD10
2 files changed, 10 insertions, 3 deletions
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index c68778d4c2..17a0ff2fc3 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2019-02-10 Treeve Jelbert <treeve@sourcemage.org>
+ * PRE_BUILD: fix refs to non-existent vpx formats
+
2019-01-13 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.0.6
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index fb9246ea83..ef92f0cb4f 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,8 +1,12 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-sed -i "/#include <QFont>/a \
-#include <QButtonGroup>" \
- modules/gui/qt/components/simple_preferences.cpp &&
+# remove refs to non-existent vpx formats, remove in vpc-1.8
+sed -i \
+-e '/VPX_IMG_FMT_RGB555/D;/VPX_IMG_FMT_RGB565/D' \
+-e '/VPX_IMG_FMT_RGB24/D;/VPX_IMG_FMT_RGB32/D' \
+-e '/VPX_IMG_FMT_ARGB/D;/VPX_IMG_FMT_ARGB_LE/D' \
+-e '/VPX_IMG_FMT_444A/D;/VPX_IMG_FMT_YUY2/D;/VPX_IMG_FMT_UYVY/D;/VPX_IMG_FMT_YVYU/D' \
+ modules/codec/vpx.c &&
# 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