Source Mage code commit list

[George Sherwood <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

 video/xdtv/DEPENDS    |   22 ++++++++++++----------
 video/xdtv/DETAILS    |    4 ++--
 video/xdtv/HISTORY    |    7 +++++++
 video/xdtv/PRE_BUILD  |    4 ++++
 video/xdtv/x264.patch |   18 ++++++++++++++++++
 5 files changed, 43 insertions(+), 12 deletions(-)

New commits:
commit cff84438cd0ca55c9fe7106cbf7d4d610d7c930f
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

    xdtv: Updated to version 2.3.3. Bug #13361.  Fixed some DEPENDS.  Added
    patch to compile with latest x264.

diff --git a/video/xdtv/DEPENDS b/video/xdtv/DEPENDS
index c7dc825..eddb242 100755
--- a/video/xdtv/DEPENDS
+++ b/video/xdtv/DEPENDS
@@ -1,12 +1,14 @@
-depends nextaw
-depends lame
-depends ffmpeg
-depends xvid
-depends zvbi
-depends xosd
-depends jpeg
-depends alevt
-depends X11-LIBS
-depends at
+depends nextaw &&
+depends lame &&
+depends xvid &&
+depends zvbi &&
+depends xosd &&
+depends jpeg &&
+depends alevt &&
+depends X11-LIBS &&
+depends at &&
+optional_depends LIBAVCODEC "" "" "to use ffmpeg libs" &&
+optional_depends x264 "--enable-x264" "--disable-x264" "to use x264" &&
 optional_depends "nxtvepg" "" "" \
  "to receive free TV programme schedules for all major networks in europe 
via analog TV card"
+
diff --git a/video/xdtv/DETAILS b/video/xdtv/DETAILS
index 0b64101..2b0194b 100755
--- a/video/xdtv/DETAILS
+++ b/video/xdtv/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xdtv
-         VERSION=2.3.2
+         VERSION=2.3.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=${SOURCEFORGE_URL}/xawdecode/${SOURCE}
-     
SOURCE_HASH=sha512:3d6727413dd0b12ddc4a3dd2906e705777acc0837fa512afff973050edf4f3f381d4bf4a174729ad249f821cf345c0ae500466080c2f38920b5a8ced708e67de
+     
SOURCE_HASH=sha512:08119620663c2deed19643ce1c47a5b4dc25b813efb501df80a80783234aec0b37c7f3f8ff4df44381c3fef1d72999926a52e1423cf629d41b7d36c577ad5b6e
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://xawdecode.sourceforge.net/
          ENTERED=20050601
diff --git a/video/xdtv/HISTORY b/video/xdtv/HISTORY
index 31afb96..ccf3fab 100644
--- a/video/xdtv/HISTORY
+++ b/video/xdtv/HISTORY
@@ -1,3 +1,10 @@
+2007-01-01 George Sherwood <george AT beernabeer.com>
+       * DETAILS: Updated to version 2.3.3. Bug #13361
+       * DEPENDS: removed depends ffmepg. Added optional_depends LIBAVCODEC
+         Added optional_depends x264
+       * PRE_BUILD: Added patch for x264
+       * x264.patch: Fixed compiles errors.
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/video/xdtv/PRE_BUILD b/video/xdtv/PRE_BUILD
new file mode 100755
index 0000000..41095bf
--- /dev/null
+++ b/video/xdtv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/x264.patch
+
diff --git a/video/xdtv/x264.patch b/video/xdtv/x264.patch
new file mode 100644
index 0000000..928d60f
--- /dev/null
+++ b/video/xdtv/x264.patch
@@ -0,0 +1,18 @@
+--- libavcodec/x264.c.orig     2007-01-02 13:44:18.000000000 +0400
++++ libavcodec/x264.c  2007-01-02 13:43:29.000000000 +0400
+@@ -142,13 +142,13 @@
+     x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
+     if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
+     else{
+-        if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
++        if(avctx->crf) x4->params.rc.f_rf_constant = avctx->crf;
+         else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
+     }
+ 
+     // if neither crf nor cqp modes are selected we have to enable the RC
+     // we do it this way because we cannot check if the bitrate has been set
+-    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
++    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1;
+ 
+     x4->params.i_bframe = avctx->max_b_frames;
+     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;