[SM-Commit] GIT changes to master grimoire by George Sherwood (f551efa822deee014072391cbd2b557932debe7e)

George Sherwood scm at sourcemage.org
Sun Jun 24 09:42:00 EDT 2007


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 video/xdtv/DETAILS              |    4 
 video/xdtv/HISTORY              |    6 +
 video/xdtv/PRE_BUILD            |    2 
 video/xdtv/x264.patch           |   18 ---
 video/xdtv/xdtv-2.4.0-mmx.patch |  229 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 238 insertions(+), 21 deletions(-)

New commits:
commit f551efa822deee014072391cbd2b557932debe7e
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xdtv: Updated to version 2.4.0.  Removed one patch and added another.

diff --git a/video/xdtv/DETAILS b/video/xdtv/DETAILS
index 2b0194b..f4d3e19 100755
--- a/video/xdtv/DETAILS
+++ b/video/xdtv/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xdtv
-         VERSION=2.3.3
+         VERSION=2.4.0
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=${SOURCEFORGE_URL}/xawdecode/${SOURCE}
-     SOURCE_HASH=sha512:08119620663c2deed19643ce1c47a5b4dc25b813efb501df80a80783234aec0b37c7f3f8ff4df44381c3fef1d72999926a52e1423cf629d41b7d36c577ad5b6e
+     SOURCE_HASH=sha512:3c13f291b824b94129f9bf26efebe1bbdc4b75bfb99bf26ef06f87cb06176eed2341b6cb2eff16c8eb7ad50835384632d63ff15d9b0943897b1da8a8f40ef64d
 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 18b3f5c..d111e83 100644
--- a/video/xdtv/HISTORY
+++ b/video/xdtv/HISTORY
@@ -1,3 +1,9 @@
+2007-06-24 George Sherwood <george at beernabeer.com>
+	* DETAILS: updated spell to 2.4.0
+	* PRE_BUILD: Removed patch and added patch
+	* xdtv-2.4.0-mmx.patch: Added patch for other archs
+	* x264.patch: Removed patch.  Incorporated by upstream
+
 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
diff --git a/video/xdtv/PRE_BUILD b/video/xdtv/PRE_BUILD
index 41095bf..a485f20 100755
--- a/video/xdtv/PRE_BUILD
+++ b/video/xdtv/PRE_BUILD
@@ -1,4 +1,4 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/x264.patch
+patch -p1 < $SCRIPT_DIRECTORY/xdtv-2.4.0-mmx.patch
 
diff --git a/video/xdtv/x264.patch b/video/xdtv/x264.patch
deleted file mode 100644
index 928d60f..0000000
--- a/video/xdtv/x264.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;
diff --git a/video/xdtv/xdtv-2.4.0-mmx.patch b/video/xdtv/xdtv-2.4.0-mmx.patch
new file mode 100644
index 0000000..1ec2bed
--- /dev/null
+++ b/video/xdtv/xdtv-2.4.0-mmx.patch
@@ -0,0 +1,229 @@
+diff -Naur xdtv-2.4.0.old/configure.in xdtv-2.4.0.new/configure.in
+--- xdtv-2.4.0.old/configure.in	2007-02-19 22:04:14.000000000 +0100
++++ xdtv-2.4.0.new/configure.in	2007-03-09 23:15:49.000000000 +0100
+@@ -223,8 +223,12 @@
+    case ${host_cpu} in
+       i386 | i486 | i586 | i686 | pentium | athlon) have_mmx=yes; host_arch=i386 ;;
+       x86_64 | amd64) have_mmx=yes; host_arch=x86_64 ;;
+-      alpha) have_mmx=no; host_arch=alpha ;;
++      alpha*) have_mmx=no; host_arch=alpha ;;
+       sparc) have_mmx=no; host_arch=sparc ;;
++      sun4u | sparc64) have_mmx=no; host_arch=sparc64 ;;
++      ppc | powerpc) have_mmx=no; host_arch=powerpc ;;
++      ppc64) have_mmx=no; host_arch=powerpc64 ;;
++      ia64*) have_mmx=no; host_arch=ia64 ;;
+       *) have_mmx=no;  host_arch=UNKNOWN ;;
+    esac
+
+@@ -2442,13 +2446,17 @@
+        if test x"$host_arch" == xx86_64; then
+          AC_DEFINE(ARCH_X86_64,1,FFMPEG is inside XdTV now!)
+          AC_DEFINE(ARCH_X86,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
+          echo "TARGET_ARCH_X86_64=yes" >> config.mak.in
+-        echo "TARGET_ARCH_X86=yes" >> config.mak.in
++         echo "TARGET_ARCH_X86=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
+        fi
+
+        if test x"$host_arch" == xalpha; then
+          AC_DEFINE(ARCH_ALPHA,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
+          echo "TARGET_ARCH_ALPHA=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
+        fi
+
+        if test x"$host_arch" == xsparc; then
+@@ -2456,6 +2464,31 @@
+          echo "TARGET_ARCH_SPARC=yes" >> config.mak.in
+        fi
+
++       if test x"$host_arch" == xsparc64; then
++         AC_DEFINE(ARCH_SPARC,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_SPARC=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xpowerpc; then
++         AC_DEFINE(ARCH_POWERPC,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xpowerpc64; then
++         AC_DEFINE(ARCH_POWERPC,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xia64; then
++         AC_DEFINE(ARCH_IA64,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_IA64=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
+     fi
+
+     AC_SUBST(FFMPEGLINK)
+diff -Naur xdtv-2.4.0.old/configure.in.Marillat xdtv-2.4.0.new/configure.in.Marillat
+--- xdtv-2.4.0.old/configure.in.Marillat	2007-02-19 22:04:14.000000000 +0100
++++ xdtv-2.4.0.new/configure.in.Marillat	2007-03-09 23:16:00.000000000 +0100
+@@ -223,8 +223,12 @@
+    case ${host_cpu} in
+       i386 | i486 | i586 | i686 | pentium | athlon) have_mmx=yes; host_arch=i386 ;;
+       x86_64 | amd64) have_mmx=yes; host_arch=x86_64 ;;
+-      alpha) have_mmx=no; host_arch=alpha ;;
++      alpha*) have_mmx=no; host_arch=alpha ;;
+       sparc) have_mmx=no; host_arch=sparc ;;
++      sun4u | sparc64) have_mmx=no; host_arch=sparc64 ;;
++      ppc | powerpc) have_mmx=no; host_arch=powerpc ;;
++      ppc64) have_mmx=no; host_arch=powerpc64 ;;
++      ia64*) have_mmx=no; host_arch=ia64 ;;
+       *) have_mmx=no;  host_arch=UNKNOWN ;;
+    esac
+
+@@ -2442,13 +2446,17 @@
+        if test x"$host_arch" == xx86_64; then
+          AC_DEFINE(ARCH_X86_64,1,FFMPEG is inside XdTV now!)
+          AC_DEFINE(ARCH_X86,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
+          echo "TARGET_ARCH_X86_64=yes" >> config.mak.in
+-        echo "TARGET_ARCH_X86=yes" >> config.mak.in
++         echo "TARGET_ARCH_X86=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
+        fi
+
+        if test x"$host_arch" == xalpha; then
+          AC_DEFINE(ARCH_ALPHA,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
+          echo "TARGET_ARCH_ALPHA=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
+        fi
+
+        if test x"$host_arch" == xsparc; then
+@@ -2456,6 +2464,32 @@
+          echo "TARGET_ARCH_SPARC=yes" >> config.mak.in
+        fi
+
++       if test x"$host_arch" == xsparc64; then
++         AC_DEFINE(ARCH_SPARC,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_SPARC=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xpowerpc; then
++         AC_DEFINE(ARCH_POWERPC,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xpowerpc64; then
++         AC_DEFINE(ARCH_POWERPC,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_POWERPC=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
++
++       if test x"$host_arch" == xia64; then
++         AC_DEFINE(ARCH_IA64,1,FFMPEG is inside XdTV now!)
++         AC_DEFINE(HAVE_FAST_64BIT,1,FFMPEG is inside XdTV now!)
++         echo "TARGET_ARCH_IA64=yes" >> config.mak.in
++         echo "HAVE_FAST_64BIT=yes" >> config.mak.in
++       fi
++
+     fi
+
+     AC_SUBST(FFMPEGLINK)
+diff -Naur xdtv-2.4.0.old/libavcodec/Makefile xdtv-2.4.0.new/libavcodec/Makefile
+--- xdtv-2.4.0.old/libavcodec/Makefile	2007-02-21 23:39:57.000000000 +0100
++++ xdtv-2.4.0.new/libavcodec/Makefile	2007-03-10 09:59:21.000000000 +0100
+@@ -11,7 +11,7 @@
+
+ CFLAGS=-DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE              \
+        -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH)                             \
+-       -I$(SRC_PATH)/libavutil $(OPTFLAGS) $(AMR_CFLAGS) 			  \
++       -I$(SRC_PATH)/libavutil $(OPTFLAGS) $(AMR_CFLAGS)                          \
+        -fno-strict-aliasing
+
+ OBJS= bitstream.o utils.o allcodecs.o             \
+@@ -136,17 +136,32 @@
+         i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o          \
+         i386/fft_3dn.o i386/fft_3dn2.o                \
+         i386/snowdsp_mmx.o
+-endif
+
+ ifeq ($(CONFIG_GPL),yes)
+ OBJS += i386/idct_mmx.o
+ endif
++endif
+
+ ifeq ($(TARGET_ARCH_SPARC),yes)
+ OBJS+=sparc/dsputil_vis.o
+ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+ endif
+
++ifeq ($(TARGET_ARCH_ALPHA),yes)
++OBJS+= alpha/dsputil_alpha.o          \
++       alpha/mpegvideo_alpha.o        \
++       alpha/simple_idct_alpha.o      \
++       alpha/motion_est_alpha.o
++
++ASM_OBJS+= alpha/dsputil_alpha_asm.o  \
++           alpha/motion_est_mvi_asm.o
++endif
++
++ifeq ($(TARGET_ARCH_POWERPC),yes)
++OBJS+= ppc/dsputil_ppc.o              \
++       ppc/mpegvideo_ppc.o
++endif
++
+ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+ NAME=avcodec
+diff -Naur xdtv-2.4.0.old/patch/Makefile.codec xdtv-2.4.0.new/patch/Makefile.codec
+--- xdtv-2.4.0.old/patch/Makefile.codec	2007-02-21 23:14:57.000000000 +0100
++++ xdtv-2.4.0.new/patch/Makefile.codec	2007-03-10 09:58:50.000000000 +0100
+@@ -11,7 +11,7 @@
+
+ CFLAGS=-DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE              \
+        -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH)                             \
+-       -I$(SRC_PATH)/libavutil $(OPTFLAGS) $(AMR_CFLAGS) 			  \
++       -I$(SRC_PATH)/libavutil $(OPTFLAGS) $(AMR_CFLAGS)                          \
+        -fno-strict-aliasing
+
+ OBJS= bitstream.o utils.o allcodecs.o             \
+@@ -136,17 +136,32 @@
+         i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o          \
+         i386/fft_3dn.o i386/fft_3dn2.o                \
+         i386/snowdsp_mmx.o
+-endif
+
+ ifeq ($(CONFIG_GPL),yes)
+ OBJS += i386/idct_mmx.o
+ endif
++endif
+
+ ifeq ($(TARGET_ARCH_SPARC),yes)
+ OBJS+=sparc/dsputil_vis.o
+ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+ endif
+
++ifeq ($(TARGET_ARCH_ALPHA),yes)
++OBJS+= alpha/dsputil_alpha.o          \
++       alpha/mpegvideo_alpha.o        \
++       alpha/simple_idct_alpha.o      \
++       alpha/motion_est_alpha.o
++
++ASM_OBJS+= alpha/dsputil_alpha_asm.o  \
++           alpha/motion_est_mvi_asm.o
++endif
++
++ifeq ($(TARGET_ARCH_POWERPC),yes)
++OBJS+= ppc/dsputil_ppc.o              \
++       ppc/mpegvideo_ppc.o
++endif
++
+ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+ NAME=avcodec



More information about the SM-Commit mailing list