Upgrade to ffmpeg-2.5

diff --git a/config/packages-list b/config/packages-list
index c9b33c6..4c3a2a3 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -87,7 +87,7 @@ EXPAT="expat-2.1.0"
 
 FCRON="fcron-3.0.6"
 FETCHMAIL="fetchmail-6.3.21"
-FFMPEG="ffmpeg-1.2"
+FFMPEG="ffmpeg-2.5"
 FFTW="fftw-3.3.2"
 FIREFOX="firefox-22.0"
 FILE_PKG="file-5.18"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 1617845..68b77ab 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -139,7 +139,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m noac ${CHORDPACK}
         ipkg -m noac -s guitartex ${GUITARTEX}
 
-        ipkg ${FFMPEG}
+        ipkg ${FFMPEG} " \
+            --enable-shared \
+            --enable-pthreads \
+            --enable-gpl \
+            --enable-nonfree \
+            --disable-ffplay \
+            --enable-libfaac \
+            --enable-libmp3lame \
+            --enable-libtheora \
+            --enable-libvorbis \
+            --enable-libxvid \
+            --enable-libfreetype \
+            --enable-libx264"
 
         ipkg ${GSTREAMER} "--disable-tests"
         ipkg ${GST_PLUGINS_BASE}

diff --git a/stage5/pkg/ffmpeg b/stage5/pkg/ffmpeg
deleted file mode 100644 (file)
index f311f39..0000000
--- a/stage5/pkg/ffmpeg
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    # ffmpeg doesn't accept --sysconfdir option
-    CONFIGURE_OPTS="\
-        --prefix=/usr \
-        --enable-shared \
-        --enable-pthreads \
-        --enable-gpl \
-        --enable-nonfree \
-        --disable-ffplay \
-        --enable-libfaac \
-        --enable-libmp3lame \
-        --enable-libtheora \
-        --enable-libvorbis \
-        --enable-libxvid \
-        --enable-libfreetype \
-        --enable-libx264"
-}