Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cec5381b351cbc62d863b4a83bfcce37e52141e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cec5381b351cbc62d863b4a83bfcce37e52141e1)
  • Date: Thu, 26 Sep 2013 19:43:38 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

video/ffmpeg/BUILD | 30 ++++-
video/ffmpeg/CONFIGURE | 28 +++++
video/ffmpeg/DEPENDS | 250
++++++++++++++++++++++++++++++++++++-------------
video/ffmpeg/DETAILS | 23 ----
video/ffmpeg/HISTORY | 3
video/ffmpeg/INSTALL | 8 +
video/ffmpeg/PREPARE | 2
video/ffmpeg/PRE_BUILD | 19 ---
8 files changed, 245 insertions(+), 118 deletions(-)

New commits:
commit cec5381b351cbc62d863b4a83bfcce37e52141e1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: rewritten the spell

diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index 3a9c15b..dc8d251 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -1,10 +1,26 @@
disable_pic &&

-#if [ $FFAMR != none ];then
-# OPTS="--enable-$FFAMR $OPTS"
-#fi &&
+if list_find "$FFMPEG_PROGRAMS" "none"; then
+ OPTS="--disable-programs $OPTS"
+elif list_find "$FFMPEG_PROGRAMS" "all"; then
+ :
+else
+ for program in $FFMPEG_PROGRAM_LIST; do
+ if ! list_find "$program" "$FFMPEG_PROGRAMS"; then
+ OPTS="--disable-$program $OPTS"
+ fi
+ done &&

-OPTS="$FFMPEG_SWSCALE $OPTS" &&
+ persistent_remove FFMPEG_PROGRAM_LIST &&
+ persistent_save &&
+ persistent_load
+fi &&
+
+OPTS="$FFMPEG_OPTS $OPTS" &&
+
+if echo "$CFLAGS" | grep -q "\-Os"; then
+ OPTS="--enable-small $OPTS"
+fi &&

# fixing issue #381
if is_depends_enabled $SPELL openjpeg; then
@@ -16,10 +32,10 @@ LDFLAGS=${LDFLAGS//-Wl,--as-needed/} &&
./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-shared \
- --enable-pthreads \
--disable-static \
- --disable-debug \
+ --enable-pthreads \
--enable-postproc \
--enable-gpl \
$OPTS &&
-make
+
+make V=1
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
index a6b5a4a..f5368be 100755
--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -1,3 +1,27 @@
+. $GRIMOIRE/config_query_multi.function &&
+
default_configure &&
-config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
- '--enable-swscale' '--disable-swscale'
+
+# backporting legacy options
+if [[ -n "$FFMPEG_SWSCALE" ]]; then
+ persistent_add FFMPEG_OPTS &&
+ list_add "FFMPEG_OPTS" "$FFMPEG_SWSCALE" &&
+
+ persistent_remove FFMPEG_SWSCALE
+fi &&
+
+config_query_option FFMPEG_OPTS "Enable software scaler support?" y \
+ "--enable-swscale" \
+ "--disable-swscale" &&
+
+config_query_option FFMPEG_OPTS "Enable debugging symbols?" y \
+ "--enable-debug" \
+ "--disable-debug" &&
+
+persistent_add FFMPEG_PROGRAM_LIST &&
+local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe ffserver" &&
+
+config_query_multi FFMPEG_PROGRAMS "Which command line programs would you
like to build?" \
+ $FFMPEG_PROGRAM_LIST \
+ all \
+ none
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index d7b1adf..c50ba92 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -1,90 +1,210 @@
-optional_depends "X86-ASSEMBLER" \
- "" \
- "--disable-yasm" \
- "for some assembler optimizations" &&
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for zlib support" &&
+
+optional_depends bzip2 \
+ "--enable-bzlib" \
+ "--disable-bzlib " \
+ "for bzlib support" &&
+
+optional_depends X86-ASSEMBLER \
+ "" \
+ "--disable-yasm" \
+ "for some assembler optimizations" &&

optional_depends celt \
"--enable-libcelt" \
"" \
- "for celt codec support via libcelt" &&
+ "for celt codec support" &&
+
optional_depends frei0r-plugins \
"--enable-frei0r" \
"" \
- "use frei0r for video filtering" &&
+ "to use frei0r for video filtering" &&

if [[ $FFMPEG_RELEASE == stable ]]; then
+ optional_depends openssl \
+ "--enable-openssl" \
+ "" \
+ "for crypto support via OpenSSL" &&

-optional_depends gnutls \
- "--enable-gnutls" \
- "" \
- "support for crypto" &&
-optional_depends libass \
- "--enable-libass" \
- "" \
- "use libass for subtitle rendering" &&
-optional_depends libmodplug \
- "--enable-libmodplug" \
- "" \
- "enable libmodplug support for playing mod files" &&
-optional_depends libvpx \
- "--enable-libvpx" \
- "" \
- "VP8 support"
+ optional_depends gnutls \
+ "--enable-gnutls" \
+ "" \
+ "for crypto support via GNUTLS" &&

-else
+ optional_depends fontconfig \
+ "--enable-fontconfig" \
+ "" \
+ "to enable fontconfig" &&

-optional_depends dirac \
- "--enable-libdirac" \
- "" \
- "for dirac encoder support via libdirac"
+ optional_depends libass \
+ "--enable-libass" \
+ "" \
+ "use libass for subtitle rendering" &&
+
+ optional_depends libmodplug \
+ "--enable-libmodplug" \
+ "" \
+ "to enable libmodplug support for playing mod files" &&

+ optional_depends twolame \
+ "--enable-libtwolame" \
+ "" \
+ "for MP2 encoding" &&
+
+ optional_depends libcdio \
+ "--enable-libcdio" \
+ "" \
+ "for audio CD grabbing" &&
+
+ optional_depends libiec61883 \
+ "--enable-libiec61883" \
+ "" \
+ "to enable iec61883" &&
+
+ optional_depends flite \
+ "--enable-libflite" \
+ "" \
+ "for voice synthesis support" &&
+
+ optional_depends libcaca \
+ "--enable-libcaca" \
+ "" \
+ "for textual display support" &&
+
+ optional_depends libbluray \
+ "--enable-libbluray" \
+ "" \
+ "for BluRay reading support" &&
+
+ optional_depends openal \
+ "--enable-openal" \
+ "" \
+ "for OpenAL 1.1 capture support" &&
+
+ optional_depends v4l-utils \
+ "--enable-libv4l2" \
+ "" \
+ "to enable v4l support" &&
+
+ optional_depends pulseaudio \
+ "--enable-libpulse" \
+ "" \
+ "for Pulseaudio input support"
+else
+ optional_depends dirac \
+ "--enable-libdirac" \
+ "" \
+ "for dirac encoder support via libdirac"
fi &&

optional_depends schroedinger \
"--enable-libschroedinger" \
"" \
"for dirac encoder/decoder support via libschroedinger" &&
+
+optional_depends libvdpau \
+ "--enable-vdpau" \
+ "--disable-vdpau" \
+ "to enable VDPAU code" &&
+
+optional_depends opencv \
+ "--enable-libopencv" \
+ "" \
+ "to video filtering via libopencv" &&
+
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "for VP8 (and VP9 for stable branch) de/encoding support" &&
+
optional_depends speex \
"--enable-libspeex" \
"" \
- "support for the Speex codec" &&
+ "for Speex codec support" &&
+
optional_depends openjpeg \
"--enable-libopenjpeg" \
"--disable-libopenjpeg" \
- "support for JPEG 2000" &&
-optional_depends "lame" \
- "--enable-libmp3lame" \
- "" \
- "for mp3 encoding via libmp3lame" &&
-optional_depends "libvorbis" \
- "--enable-libvorbis" \
- "" \
- "for ogg/vorbis support" &&
-optional_depends "imlib2" \
- "" \
- "" \
- "for imlib2 support" &&
-optional_depends "freetype2" \
- "" \
- "" \
- "for a text render plugin" &&
-optional_depends "xvid" \
- "--enable-libxvid" \
- "" \
- "for xvid support" &&
-optional_depends sdl \
- "" \
- "--disable-ffplay" \
- "for ffplay video player" &&
-optional_depends faac \
- "--enable-libfaac --enable-nonfree" \
- "" \
- "support for faac" &&
-optional_depends libtheora \
- "--enable-libtheora" \
- "" \
- "theora codec" &&
-optional_depends x264 \
- "--enable-libx264" \
- "" \
- "h.264 encoder"
+ "for JPEG 2000 support" &&
+
+optional_depends lame \
+ "--enable-libmp3lame" \
+ "" \
+ "for mp3 encoding" &&
+
+optional_depends libvorbis \
+ "--enable-libvorbis" \
+ "" \
+ "for ogg/vorbis support" &&
+
+optional_depends freetype2 \
+ "--enable-libfreetype" \
+ "" \
+ "for a text render plugin" &&
+
+optional_depends xvid \
+ "--enable-libxvid" \
+ "" \
+ "for xvid support" &&
+
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player" &&
+
+optional_depends faac \
+ "--enable-libfaac --enable-nonfree" \
+ "" \
+ "for AAC encoding via libfaac
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}) support" &&
+
+optional_depends opencore-amr \
+ "--enable-libopencore-amrnb --enable-version3" \
+ "" \
+ "for AMR-NB de/encoding via libopencore-amrnb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&
+
+optional_depends opencore-amr \
+ "--enable-libopencore-amrwb --enable-version3" \
+ "" \
+ "for AMR-WB decoding via libopencore-amrwb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&
+
+optional_depends libtheora \
+ "--enable-libtheora" \
+ "" \
+ "for Theora encoding" &&
+
+optional_depends x264 \
+ "--enable-libx264" \
+ "" \
+ "for H.264 encoding" &&
+
+optional_depends gsm \
+ "--enable-libgsm" \
+ "" \
+ "for GSM de/encoding" &&
+
+optional_depends rtmpdump \
+ "--enable-librtmp" \
+ "" \
+ "for RTMP[E] support" &&
+
+optional_depends libdc1394 \
+ "--enable-libdc1394" \
+ "" \
+ "for IIDC-1394 grabbing" &&
+
+if is_depends_enabled $SPELL libdc1394; then
+ depends libraw1394
+fi &&
+
+optional_depends libx11 \
+ "--enable-x11grab" \
+ "" \
+ "to enable X11 grabbing" &&
+
+if is_depends_enabled $SPELL libx11; then
+ depends libxext &&
+ depends libxfixes
+fi
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index e26abee..ba5b24f 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -13,27 +13,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=ffmpeg.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-#case $FFAMR in
-# none);;
-# *)
-# amr_nb)
-# VERSION2=26104-610
-# SOURCE2=$VERSION2.zip
-#SOURCE2_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/$SOURCE2
-#
SOURCE2_HASH=sha512:2ab3c1be43b17b655674b93a17b3ebcf3b95a6483bf9c2177dc00dd2a2f2802cb6685e679982cb0edefce90bb854c7842be324d5f1bd17cf0d349f9c737c2d68
-# amr_nb-fixed)
-# VERSION3=26073-600
-# SOURCE3=$VERSION3.zip
-#SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/$SOURCE3
-#
SOURCE3_HASH=sha512:db9a7f5514d1a4a27062720f8ba5357f89cc6953c81b5b09defb37469e9a0b1195e9722d7b415152ad9642e1b1d7dddfd4e739bfc42b0c2fa6094d44faa50cde
-# amr_wb)
-# VERSION4=26204-600
-# SOURCE4=$VERSION4.zip
-#SOURCE4_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4
-#
SOURCE4_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948
-# ;;
-#esac
- WEB_SITE=http://ffmpeg.org
+ DOC_DIRS=""
+ WEB_SITE=http://ffmpeg.org/
ENTERED=20030514
LICENSE[0]=GPL
KEYWORDS="video"
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index af23feb..2d61cf6 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2013-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, CONFIGURE, DEPENDS, INSTALL, PREPARE:
rewritten
+
2013-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.3 (stable)

diff --git a/video/ffmpeg/INSTALL b/video/ffmpeg/INSTALL
index d3f6c19..ae7814d 100755
--- a/video/ffmpeg/INSTALL
+++ b/video/ffmpeg/INSTALL
@@ -1,3 +1,7 @@
make_single &&
-install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf &&
-make install
+make V=1 install &&
+make_normal &&
+
+if list_find "ffserver" "$FFMPEG_PROGRAMS"; then
+ install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
+fi
diff --git a/video/ffmpeg/PREPARE b/video/ffmpeg/PREPARE
index 328c960..7735aea 100755
--- a/video/ffmpeg/PREPARE
+++ b/video/ffmpeg/PREPARE
@@ -1,5 +1,3 @@
config_query_list FFMPEG_RELEASE "Select which release to build:" \
stable \
legacy
-
-#config_query_list FFAMR "Include an AMR codec?" none amr_nb amr_nb-fixed
amr_wb
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 7e686d0..b7a3542 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -7,22 +7,3 @@ sed -i \
configure &&
#s|\\\$|\$|;
sedit '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define
INT64_C(c) c ## LL\n#endif\n#endif' libavcodec/avcodec.h
-
-#message amr=$FFAMR &&
-#cd libavcodec &&
-#case $FFAMR in
-# none);;
-# *)
-#message amr_nb=$VERSION2 &&
-# unpack_file 2 &&
-# unzip ${VERSION2}*.zip &&
-# mv c-code amr_float &&
-#message amr_nb-fixed=$VERSION3 &&
-# unpack_file 3 &&
-# unzip ${VERSION3}*.zip &&
-# mv c-code amr &&
-#message amr_wb=$VERSION4 &&
-# unpack_file 4 &&
-# unzip ${VERSION4}*.zip &&
-# mv c-code amrwb_float
-#esac



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cec5381b351cbc62d863b4a83bfcce37e52141e1), Vlad Glagolev, 09/26/2013

Archive powered by MHonArc 2.6.24.

Top of Page