Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (38f5dc8b7e9c25baee2ff589e4b4c6f08cfb4bea)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (38f5dc8b7e9c25baee2ff589e4b4c6f08cfb4bea)
  • Date: Mon, 23 Oct 2006 08:15:17 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

video-libs/libdv/BUILD | 15 -
video-libs/libdv/DETAILS | 5
video-libs/libdv/HISTORY | 4
video-libs/libdv/PRE_BUILD | 6
video-libs/libdv/libdv-0.104-amd64reloc.patch | 262
--------------------------
video-libs/libdv/libdv-0.104-mmx.patch | 33 ---
video-libs/libdv/libdv-mxx.patch | 12 -
video-libs/libdv/libdv-no-mxx.patch | 12 -
8 files changed, 6 insertions(+), 343 deletions(-)

New commits:
commit 38f5dc8b7e9c25baee2ff589e4b4c6f08cfb4bea
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

libdv-1.0.0

diff --git a/video-libs/libdv/BUILD b/video-libs/libdv/BUILD
deleted file mode 100755
index 8328a2d..0000000
--- a/video-libs/libdv/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# This kludge is required because of a widely known bug in
-# dvlib, which has been fixed but not released and which
-# causes kino to segfault. In the next release the need for
-# this should go away, but in the meantime it is necessary
-# to work around, as documented here:
-#
http://www.schirmacher.de/cgi-bin/dcforum/dcboard.cgi?az=show_thread&forum=DCForumID1&om=104&omm=3
-
-if [ "$(echo $CFLAGS |grep '\-mmmx')" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/libdv-mxx.patch
-else
- patch -p1 < $SCRIPT_DIRECTORY/libdv-no-mxx.patch
-fi &&
-
-export CFLAGS="$CFLAGS -O3" && # fix compile issues
-default_build
diff --git a/video-libs/libdv/DETAILS b/video-libs/libdv/DETAILS
index dbba26d..463adc5 100755
--- a/video-libs/libdv/DETAILS
+++ b/video-libs/libdv/DETAILS
@@ -1,12 +1,11 @@
SPELL=libdv
- VERSION=0.104
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
WEB_SITE=http://libdv.sourceforge.net/
ENTERED=20020202
- UPDATED=20050120
-
SOURCE_HASH=sha512:cee568274666e5da7fb2286b44455f459e32b81ab0d13ad8696fc1c801520dc41490cfbe49538b50908189c2485f6274079b47511da66df81fd8c998b72d8092
+
SOURCE_HASH=sha512:19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
LICENSE[0]=LGPL
KEYWORDS="codec video libs"
SHORT="libdv is a software codec for DV video"
diff --git a/video-libs/libdv/HISTORY b/video-libs/libdv/HISTORY
index 63b8b39..488b157 100644
--- a/video-libs/libdv/HISTORY
+++ b/video-libs/libdv/HISTORY
@@ -1,3 +1,7 @@
+2006-10-23 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.0.0
+ * BUILD, PRE_BUILD, *.patch: remove
+
2006-05-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, libdv-0.104-mmx.patch: fix compile with gcc 4.1
* BUILD, PRE_BUILD: moved x86_64 patching to PRE_BUILD, use
diff --git a/video-libs/libdv/PRE_BUILD b/video-libs/libdv/PRE_BUILD
deleted file mode 100755
index 35e6781..0000000
--- a/video-libs/libdv/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/libdv-0.104-mmx.patch &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} = x86_64 ]]; then
- patch -p3 < $SCRIPT_DIRECTORY/libdv-0.104-amd64reloc.patch
-fi
diff --git a/video-libs/libdv/libdv-0.104-amd64reloc.patch
b/video-libs/libdv/libdv-0.104-amd64reloc.patch
deleted file mode 100644
index 666ce7a..0000000
--- a/video-libs/libdv/libdv-0.104-amd64reloc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -aur /tmp/libdv-0.104/libdv/encode_x86_64.S
/tmp/libdv-0.104-patched/libdv/encode_x86_64.S
---- /tmp/libdv-0.104/libdv/encode_x86_64.S 2004-11-17 03:36:30.000000000
+0000
-+++ /tmp/libdv-0.104-patched/libdv/encode_x86_64.S 2004-12-10
07:53:12.000000000 +0000
-@@ -47,7 +47,8 @@
-
- mov $63, %rcx # loop counter
-
-- mov vlc_encode_lookup(%rip), %r11
-+ mov vlc_encode_lookup@GOTPCREL(%rip), %r11
-+ mov (%r11),%r11
-
- pxor %mm0, %mm0
- pxor %mm2, %mm2
-@@ -129,7 +130,8 @@
- add $2, %rdi /* skip the DC coefficient */
- mov $63, %rcx
-
-- mov vlc_num_bits_lookup(%rip), %r11
-+ mov vlc_num_bits_lookup@GOTPCREL(%rip), %r11
-+ mov (%r11),%r11
-
- vlc_num_bits_block_x86_loop:
- movw (%rdi), %ax /* get the next coeffiecient */
-diff -aur /tmp/libdv-0.104/libdv/idct_block_mmx_x86_64.S
/tmp/libdv-0.104-patched/libdv/idct_block_mmx_x86_64.S
---- /tmp/libdv-0.104/libdv/idct_block_mmx_x86_64.S 2004-10-20
04:49:24.000000000 +0100
-+++ /tmp/libdv-0.104-patched/libdv/idct_block_mmx_x86_64.S 2004-12-10
07:38:23.000000000 +0000
-@@ -22,7 +22,7 @@
- /* void _dv_idct_88(dv_coeff_t *block) */
- /* argument block=rdi */
-
-- lea preSC(%rip), %r11
-+ mov preSC@GOTPCREL(%rip), %r11
-
- /*
- * column 0: even part
-diff -aur /tmp/libdv-0.104/libdv/quant_x86_64.S
/tmp/libdv-0.104-patched/libdv/quant_x86_64.S
---- /tmp/libdv-0.104/libdv/quant_x86_64.S 2004-11-17 03:36:30.000000000
+0000
-+++ /tmp/libdv-0.104-patched/libdv/quant_x86_64.S 2004-12-10
07:36:42.000000000 +0000
-@@ -73,10 +73,10 @@
- /* pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */
- mov %rsi,%rax /* qno */
- mov %rdx,%r12 /* class */
-- lea dv_quant_offset(%rip),%rcx
-+ mov dv_quant_offset@GOTPCREL(%rip),%rcx
- movzbq (%rcx,%r12,1),%rcx /* dv_quant_offset[class] */
- add %rcx,%rax /* qno + */
-- lea dv_quant_shifts(%rip),%r11
-+ mov dv_quant_shifts@GOTPCREL(%rip),%r11
- lea (%r11,%rax,4),%r11 /* r11 is pq = dv_quant_shifts[...] */
-
- /* extra = (class == 3); */
-@@ -217,10 +217,10 @@
- mov %rsi,%rax /* qno */
- mov %rdx,%r12 /* class */
-
-- lea dv_quant_offset(%rip),%rcx
-+ mov dv_quant_offset@GOTPCREL(%rip),%rcx
- movzbq (%rcx,%r12,1),%rcx
- add %rcx,%rax
-- lea dv_quant_shifts(%rip),%r11
-+ mov dv_quant_shifts@GOTPCREL(%rip),%r11
- lea (%r11,%rax,4),%r11 /* r11 is pq */
-
- /* extra = (class == 3); */
-diff -aur /tmp/libdv-0.104/libdv/vlc_x86_64.S
/tmp/libdv-0.104-patched/libdv/vlc_x86_64.S
---- /tmp/libdv-0.104/libdv/vlc_x86_64.S 2004-10-20 04:49:24.000000000
+0100
-+++ /tmp/libdv-0.104-patched/libdv/vlc_x86_64.S 2004-12-12
05:43:49.000000000 +0000
-@@ -16,28 +16,28 @@
- /* klass = dv_vlc_classes[maxbits][(bits &
(dv_vlc_class_index_mask[maxbits])) >> */
- /* (dv_vlc_class_index_rshift[maxbits])]; */
- /* xor %rbp,%rbp */
-- lea dv_vlc_class_index_mask(%rip),%r11 /* use %rip for
PIC code */
-+ mov dv_vlc_class_index_mask@GOTPCREL(%rip),%r11 /* use %rip for
PIC code */
- mov (%r11,%rbx,4),%ebp /* int32 */ /*
dv_vlc_class_index_mask[maxbits] */
- and %eax,%ebp /* bits & */
-- lea dv_vlc_class_index_rshift(%rip),%rcx
-+ mov dv_vlc_class_index_rshift@GOTPCREL(%rip),%rcx
- mov (%rcx,%rbx,4),%ecx /* int32 */ /*
dv_vlc_class_index_rshift[maxbits] */
- sar %cl,%ebp /* >> */
-- lea dv_vlc_classes(%rip),%rcx
-+ mov dv_vlc_classes@GOTPCREL(%rip),%rcx
- mov (%rcx,%rbx,8),%rcx /* ptr */ /*
dv_vlc_classes[maxbits], a pointer */
- movsbq (%rcx,%rbp,1),%rbp /* int8 */ /* klass = */
-
- /* *result = dv_vlc_lookups[klass][(bits &
(dv_vlc_index_mask[klass])) >> */
- /* (dv_vlc_index_rshift[klass])]; */
- /* xor %rbx,%rbx */
-- lea dv_vlc_index_mask(%rip),%r11
-+ mov dv_vlc_index_mask@GOTPCREL(%rip),%r11
- mov (%r11,%rbp,4),%ebx /* int32 */ /*
(dv_vlc_index_mask[klass]) */
- /* xor %rcx,%rcx */
-- lea dv_vlc_index_rshift(%rip),%r11
-+ mov dv_vlc_index_rshift@GOTPCREL(%rip),%r11
- mov (%r11,%rbp,4),%ecx /* int32 */ /*
dv_vlc_index_rshift[klass] */
- and %eax,%ebx /* bits & */
- sar %cl,%ebx /* >> */
-
-- lea dv_vlc_lookups(%rip),%r11
-+ mov dv_vlc_lookups@GOTPCREL(%rip),%r11
- mov (%r11,%rbp,8),%rbp /* ptr */ /*
dv_vlc_lookups[klass] */
- mov (%rbp,%rbx,4),%ebp /* int32 */ /* *result = */
-
-@@ -57,7 +57,7 @@
- mov %ebp,%ecx
- sar $8,%ecx
- and $0xff,%ecx /* result->len */
-- lea sign_mask(%rip),%rbx
-+ mov sign_mask@GOTPCREL(%rip),%rbx
- mov (%rbx,%rcx,4),%ebx /* int32 */
- and %ebx,%eax
- neg %eax
-@@ -109,17 +109,17 @@
- mov %rax,%rbp
- and $0xfe00,%ebp
- sar $9,%ebp
-- lea dv_vlc_class_lookup5(%rip),%r11
-+ mov dv_vlc_class_lookup5@GOTPCREL(%rip),%r11
- movsbq (%r11,%rbp),%rbp /* int8 klass */
-
-- lea dv_vlc_index_mask(%rip),%rbx
-+ mov dv_vlc_index_mask@GOTPCREL(%rip),%rbx
- mov (%rbx,%rbp,4),%ebx /* int32 */
-- lea dv_vlc_index_rshift(%rip),%rcx
-+ mov dv_vlc_index_rshift@GOTPCREL(%rip),%rcx
- mov (%rcx,%rbp,4),%ecx /* int32 */
- and %eax,%ebx
- sar %cl,%ebx /* %rbx is klass */
-
-- lea dv_vlc_lookups(%rip),%r11
-+ mov dv_vlc_lookups@GOTPCREL(%rip),%r11
- mov (%r11,%rbp,8),%rbp /* ptr */
- mov (%rbp,%rbx,4),%ebp /* int32 */
-
-@@ -138,7 +138,7 @@
- mov %ebp,%ecx
- sar $8,%ecx
- and $0xff,%ecx
-- lea sign_mask(%rip),%r11
-+ mov sign_mask@GOTPCREL(%rip),%r11
- mov (%r11,%rcx,4),%ecx /* int32 */
- and %ecx,%eax
- neg %eax
-@@ -253,7 +253,7 @@
-
- /* Attempt to use the shortcut first. If it hits, then
- this vlc term has been decoded. */
-- lea dv_vlc_class1_shortcut(%rip),%r10
-+ mov dv_vlc_class1_shortcut@GOTPCREL(%rip),%r10
- mov (%r10,%rcx,4),%r11d /* record32 dv_vlc_tab_t */
- test $0x80,%r11d
-
-@@ -267,17 +267,17 @@
-
- /* %rax is bits */
-
-- lea dv_vlc_class_lookup5(%rip),%r10
-+ mov dv_vlc_class_lookup5@GOTPCREL(%rip),%r10
- movsbq (%r10,%rcx,1),%rcx /* int8 */
-
- /* xor %r12,%r12 */
-- lea dv_vlc_index_mask(%rip),%r10
-+ mov dv_vlc_index_mask@GOTPCREL(%rip),%r10
- mov (%r10,%rcx,4),%r12d /* int32 */
-
-- lea dv_vlc_lookups(%rip),%r10
-+ mov dv_vlc_lookups@GOTPCREL(%rip),%r10
- mov (%r10,%rcx,8),%r11 /* ptr->record32 */
-
-- lea dv_vlc_index_rshift(%rip),%r10
-+ mov dv_vlc_index_rshift@GOTPCREL(%rip),%r10
- mov (%r10,%rcx,4),%ecx /* int32 */
-
- and %eax,%r12d
-@@ -303,7 +303,7 @@
- mov %r11d,%ecx
- sar $8,%ecx
- and $0xff,%ecx
-- lea sign_mask(%rip),%r10
-+ mov sign_mask@GOTPCREL(%rip),%r10
- mov (%r10,%rcx,4),%ecx /* int32 */
- and %ecx,%eax
- neg %eax
-@@ -388,7 +388,8 @@
- mov %r11,%rsi /* bits */
- mov %rax,%rdi /* bits_left */
- lea vlc(%rip),%rdx /* *vlc */
-- call dv_decode_vlc
-+ mov dv_decode_vlc@GOTPCREL(%rip),%r11
-+ call *%r11
- pop %rdx
- pop %rsi
- pop %rdi
-@@ -473,7 +474,7 @@
- movl %r11d,dv_macroblock_t_eob_count(%r13) /* int32 */
-
- /* mb->i = (seg->i + dv_super_map_vertical[m]) % (seg->isPAL?12:10);
*/
-- lea dv_super_map_vertical(%rip),%r11
-+ mov dv_super_map_vertical@GOTPCREL(%rip),%r11
- movl (%r11,%rax,4),%r11d /* int32 */
- /* xor %rcx,%rcx */
- movl dv_videosegment_t_i(%r12),%ecx /* int32 */
-@@ -493,7 +494,7 @@
- movl %r11d,dv_macroblock_t_i(%r13) /* int32 */
-
- /* mb->j = dv_super_map_horizontal[m]; */
-- lea dv_super_map_horizontal(%rip),%r11
-+ mov dv_super_map_horizontal@GOTPCREL(%rip),%r11
- movl (%r11,%rax,4),%r11d /* int32 */
- movl %r11d,dv_macroblock_t_j(%r13) /* int32 */
-
-@@ -546,7 +547,8 @@
-
- /* bl->reorder = &dv_reorder[bl->dct_mode][1]; */
- shl $6,%rax /* *64 */
-- lea (dv_reorder+1)(%rip),%rcx
-+ mov dv_reorder@GOTPCREL(%rip),%rcx
-+ add $1,%rcx
- add %rcx,%rax
- mov %rax,dv_block_t_reorder(%r15) /* ptr */
-
-@@ -557,13 +559,13 @@
- /* bl->offset= mb_start + dv_parse_bit_start[b]; */
- /* xor %rcx,%rcx */
- movl mb_start(%rip),%ecx /* int32 */
-- lea dv_parse_bit_start(%rip),%rax
-+ mov dv_parse_bit_start@GOTPCREL(%rip),%rax
- mov (%rax,%r12,4),%eax /* int32 */
- add %rcx,%rax
- movl %eax,dv_block_t_offset(%r15) /* int32 */
-
- /* bl->end= mb_start + dv_parse_bit_end[b]; */
-- lea dv_parse_bit_end(%rip),%rax
-+ mov dv_parse_bit_end@GOTPCREL(%rip),%rax
- mov (%rax,%r12,4),%eax /* int32 */
- add %ecx,%eax
- mov %eax,dv_block_t_end(%r15) /* int32 */
-@@ -603,7 +605,8 @@
- mov dv_videosegment_t_bs(%rdi),%rdi /* passed in rdi was seg,
now passing seg->bs */
- mov %r13,%rsi /* mb */
- mov %r15,%rdx /* bl */
-- call dv_parse_ac_coeffs_pass0
-+ mov dv_parse_ac_coeffs_pass0@GOTPCREL(%rip),%r11
-+ call *%r11
- pop %rdi
- pop %rsi
- pop %rdx
-@@ -635,10 +638,12 @@
- mov %rsi,%rax /* quality */
- and $DV_QUALITY_AC_MASK,%rax
- cmp $DV_QUALITY_AC_2,%rax
-+
-+ jne done
-+ mov dv_parse_ac_coeffs@GOTPCREL(%rip),%r11
-+ jmp *%r11
-
-- jz dv_parse_ac_coeffs
--
-- mov $0,%rax
-+done: mov $0,%rax
-
- ret
-
diff --git a/video-libs/libdv/libdv-0.104-mmx.patch
b/video-libs/libdv/libdv-0.104-mmx.patch
deleted file mode 100644
index 09a688d..0000000
--- a/video-libs/libdv/libdv-0.104-mmx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libdv-0.103/libdv/mmx.h.mmx 2006-02-13 16:43:45.000000000 -0500
-+++ libdv-0.103/libdv/mmx.h 2006-02-13 16:43:57.000000000 -0500
-@@ -353,16 +353,16 @@
- #define mmx_i2r(op, imm, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (imm) )
-+ : "i" (imm) )
-
- #define mmx_m2r(op, mem, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem))
-+ : "m" (mem))
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-@@ -372,8 +372,8 @@
- __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- #op " %1, %%mm0\n\t" \
- "movq %%mm0, %0" \
-- : "=X" (memd) \
-- : "X" (mems))
-+ : "=m" (memd) \
-+ : "m" (mems))
-
- #endif
-
diff --git a/video-libs/libdv/libdv-mxx.patch
b/video-libs/libdv/libdv-mxx.patch
deleted file mode 100755
index ac1f001..0000000
--- a/video-libs/libdv/libdv-mxx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r libdv-0.9/libdv/dv.c libdv-0.9.fixed/libdv/dv.c
---- libdv-0.9/libdv/dv.c Thu Apr 26 14:08:47 2001
-+++ libdv-0.9.fixed/libdv/dv.c Sat Jan 26 14:43:15 2002
-@@ -133,7 +133,7 @@
- static gboolean done=FALSE;
- if(done) goto init_done;
- #if ARCH_X86
-- dv_use_mmx = mmx_ok();
-+ dv_use_mmx = 1;
- #endif
- weight_init();
- dct_init();
diff --git a/video-libs/libdv/libdv-no-mxx.patch
b/video-libs/libdv/libdv-no-mxx.patch
deleted file mode 100755
index b17f60a..0000000
--- a/video-libs/libdv/libdv-no-mxx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r libdv-0.9/libdv/dv.c libdv-0.9.fixed/libdv/dv.c
---- libdv-0.9/libdv/dv.c Thu Apr 26 14:08:47 2001
-+++ libdv-0.9.fixed/libdv/dv.c Sat Jan 26 14:43:15 2002
-@@ -133,7 +133,7 @@
- static gboolean done=FALSE;
- if(done) goto init_done;
- #if ARCH_X86
-- dv_use_mmx = mmx_ok();
-+ dv_use_mmx = 0;
- #endif
- weight_init();
- dct_init();



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (38f5dc8b7e9c25baee2ff589e4b4c6f08cfb4bea), Treeve Jelbert, 10/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page