Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (a70ab69cf08dab718acf114759957c08d1a900d6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (a70ab69cf08dab718acf114759957c08d1a900d6)
  • Date: Fri, 7 Nov 2008 16:49:13 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

libs/glibc/HISTORY | 5 +++++
libs/glibc/PRE_BUILD | 8 ++++++++
libs/glibc/fnstsw.patch | 11 +++++++++++
video/avidemux2/HISTORY | 3 +++
video/avidemux2/PRE_BUILD | 5 +++++
video/avidemux2/x264.patch | 40 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 72 insertions(+)

New commits:
commit 4ea5b6a428c9edbc6c9e475708b9fc4e249da952
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

glibc: added fnstsw.patch (applied via PRE_BUILD) to fix asm compilation
issue for version 2.7 with latest binutils

commit 7f83f2f4507285a181fa96c8843cd02e38758cd3
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

avidemux2: added PRE_BUILD and x264.patch to fix compilation issue with
latest x264

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 1700090..6cff206 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2008-11-07 : Julien "_kaze_" ROZO <julien AT rozo.org>
+ * fnstsw.patch: added, fix asm compilation issue for version 2.7
+ with latest binutils
+ * PRE_BUILD: apply fnstsw.patch
+
2008-10-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8 from CVS #14831

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index afdf138..9321bcc 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -68,6 +68,14 @@ if [[ "$GLIBC_CVS" != "y" ]]; then
autoconf
fi &&

+#
+# Fix for fnstsw asm issue with latest binutils
+# http://sourceware.org/ml/binutils/2008-01/msg00151.html
+#
+if [[ "$GLIBC_CVS" != "y" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/fnstsw.patch
+fi &&
+
# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure &&
diff --git a/libs/glibc/fnstsw.patch b/libs/glibc/fnstsw.patch
new file mode 100644
index 0000000..89a71f6
--- /dev/null
+++ b/libs/glibc/fnstsw.patch
@@ -0,0 +1,11 @@
+--- glibc-2.7.old/sysdeps/i386/fpu/ftestexcept.c 2004-03-05
11:14:48.000000000 +0100
++++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c 2008-11-07 23:45:48.000000000
+0100
+@@ -26,7 +26,7 @@
+ int
+ fetestexcept (int excepts)
+ {
+- int temp;
++ short temp;
+ int xtemp = 0;
+
+ /* Get current exceptions. */
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index a3e0400..9e55aec 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,6 @@
+2008-11-07 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, x264.patch: added, fix compilation issue with latest x264
+
2008-10-21 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added cmake flags to disable each optional dependency,
added aften, esound, JACK-DRIVER and libsamplerate as optional
diff --git a/video/avidemux2/PRE_BUILD b/video/avidemux2/PRE_BUILD
new file mode 100755
index 0000000..bc59814
--- /dev/null
+++ b/video/avidemux2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if is_depends_enabled $SPELL x264; then
+ patch -p1 < $SPELL_DIRECTORY/x264.patch
+fi
diff --git a/video/avidemux2/x264.patch b/video/avidemux2/x264.patch
new file mode 100644
index 0000000..886b652
--- /dev/null
+++ b/video/avidemux2/x264.patch
@@ -0,0 +1,40 @@
+diff -ur avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp
avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp
+--- avidemux_2.4.3.orig/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09
01:45:06.048940024 -0700
++++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp 2008-10-09
01:49:07.606940126 -0700
+@@ -109,8 +109,14 @@
+ MKPARAM(i_bframe,MaxBFrame);
+ MKPARAM(i_bframe_bias,Bias);
+ MKPARAM( b_bframe_pyramid,BasReference );
++#if X264_BUILD < 65
+ MKPARAM(analyse. b_bidir_me,BidirME );
++#endif
++#if X264_BUILD >= 63
++ MKPARAM( i_bframe_adaptive, Adaptative);
++#else
+ MKPARAM( b_bframe_adaptive, Adaptative);
++#endif
+ MKPARAM( analyse.b_weighted_bipred, Weighted);
+ MKPARAM( b_cabac , CABAC);
+ MKPARAM( analyse.i_trellis, Trellis);
+@@ -118,12 +124,16 @@
+ #define MIN_RDO 6
+ if(zparam->PartitionDecision+1>=MIN_RDO)
+ {
+- int rank,parity;
+- rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
+- parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
++#if X264_BUILD >= 65
++ param.analyse.i_subpel_refine = zparam->PartitionDecision + 1;
++#else
++ int rank,parity;
++ rank=((zparam->PartitionDecision+1-MIN_RDO)>>1)+MIN_RDO;
++ parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
+
+- param.analyse.i_subpel_refine=rank;
+- param.analyse.b_bframe_rdo=parity;
++ param.analyse.i_subpel_refine=rank;
++ param.analyse.b_bframe_rdo=parity;
++#endif
+ }
+ MKPARAM(analyse.b_chroma_me,ChromaME);
+ MKPARAM(b_deblocking_filter,DeblockingFilter);




Archive powered by MHonArc 2.6.24.

Top of Page