summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libdv')
-rw-r--r--media-libs/libdv/files/digest-libdv-0.1013
-rw-r--r--media-libs/libdv/files/digest-libdv-0.1023
-rw-r--r--media-libs/libdv/files/digest-libdv-0.1043
-rw-r--r--media-libs/libdv/files/digest-libdv-0.104-r16
-rw-r--r--media-libs/libdv/files/digest-libdv-0.104-r23
-rw-r--r--media-libs/libdv/files/digest-libdv-0.104-r36
-rw-r--r--media-libs/libdv/files/digest-libdv-0.99-r13
-rw-r--r--media-libs/libdv/files/libdv-0.103-mmx.patch37
-rw-r--r--media-libs/libdv/files/libdv-0.104-amd64reloc.patch265
-rw-r--r--media-libs/libdv/files/libdv-0.104-gcc4.patch22
-rw-r--r--media-libs/libdv/files/libdv-0.104-inline.patch11
-rw-r--r--media-libs/libdv/files/libdv-0.104-no-exec-stack.patch137
-rw-r--r--media-libs/libdv/files/libdv-0.104-playdv-segv.patch25
-rw-r--r--media-libs/libdv/files/libdv-0.99-disablegtk.patch111
-rw-r--r--media-libs/libdv/libdv-0.101.ebuild45
-rw-r--r--media-libs/libdv/libdv-0.102.ebuild45
-rw-r--r--media-libs/libdv/libdv-0.104-r1.ebuild57
-rw-r--r--media-libs/libdv/libdv-0.104-r2.ebuild51
-rw-r--r--media-libs/libdv/libdv-0.104-r3.ebuild53
-rw-r--r--media-libs/libdv/libdv-0.104.ebuild47
-rw-r--r--media-libs/libdv/libdv-0.99-r1.ebuild46
21 files changed, 0 insertions, 979 deletions
diff --git a/media-libs/libdv/files/digest-libdv-0.101 b/media-libs/libdv/files/digest-libdv-0.101
deleted file mode 100644
index 061abf6aa877..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.101
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d42832cbe0ad2c1c1f6a7eccf35f9323 libdv-0.101.tar.gz 476510
-RMD160 9bb471f52cafcfd44afc46b51e0c501a251c20fb libdv-0.101.tar.gz 476510
-SHA256 706d1caf3b5e7af1e16d1ea91ddd9aad60a529a61ac08509e1aa99f61dca21d5 libdv-0.101.tar.gz 476510
diff --git a/media-libs/libdv/files/digest-libdv-0.102 b/media-libs/libdv/files/digest-libdv-0.102
deleted file mode 100644
index 91d19e73c02f..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.102
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21f2968fa756961ee2cb7d96834ade80 libdv-0.102.tar.gz 476931
-RMD160 262ea1dc3e0746002ed90ba1b17e78caa511ca15 libdv-0.102.tar.gz 476931
-SHA256 bc6f98d46e82c10d51bfc46d68ec34e3ff7afef0610b96b2d317d9ec75c09271 libdv-0.102.tar.gz 476931
diff --git a/media-libs/libdv/files/digest-libdv-0.104 b/media-libs/libdv/files/digest-libdv-0.104
deleted file mode 100644
index e5209c8ed3c6..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.104
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
-RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
-SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r1 b/media-libs/libdv/files/digest-libdv-0.104-r1
deleted file mode 100644
index 2aaa835604ca..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.104-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cb8f342ef1362051f1289b86bb2ba051 libdv-0.104-pic-fix.patch.bz2 9343
-RMD160 b72775a37841f2820f89bec029ec18e9c09453d9 libdv-0.104-pic-fix.patch.bz2 9343
-SHA256 1142c69169d0915b36efe97173744cb751e9ef1d2df319f9cb7924c228c672dd libdv-0.104-pic-fix.patch.bz2 9343
-MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
-RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
-SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r2 b/media-libs/libdv/files/digest-libdv-0.104-r2
deleted file mode 100644
index e5209c8ed3c6..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.104-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
-RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
-SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r3 b/media-libs/libdv/files/digest-libdv-0.104-r3
deleted file mode 100644
index 4dec9f7ddf51..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.104-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7c5f94b57dd3bc28f97ff37e344f53b3 libdv-0.104-pic.patch.bz2 11018
-RMD160 25b9fb554a88d2a76b94a32c41050c065202e040 libdv-0.104-pic.patch.bz2 11018
-SHA256 42130856fa711b703dd3404b62887fb7148eb59dd129879943c3b60ead90b55e libdv-0.104-pic.patch.bz2 11018
-MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
-RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
-SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/digest-libdv-0.99-r1 b/media-libs/libdv/files/digest-libdv-0.99-r1
deleted file mode 100644
index 8afda950f489..000000000000
--- a/media-libs/libdv/files/digest-libdv-0.99-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 602fa45ad13059b571fef8548a4239a4 libdv-0.99.tar.gz 359334
-RMD160 d123497afa505946fb8e484e2b32929fdaffad7d libdv-0.99.tar.gz 359334
-SHA256 e0027b77098d0165d37d85264e45b1c4273599bd7684ff1511a83fc6dc5fdea7 libdv-0.99.tar.gz 359334
diff --git a/media-libs/libdv/files/libdv-0.103-mmx.patch b/media-libs/libdv/files/libdv-0.103-mmx.patch
deleted file mode 100644
index d48ec08f78c8..000000000000
--- a/media-libs/libdv/files/libdv-0.103-mmx.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Ripped from Fedora
-
-http://bugs.gentoo.org/122704
-
---- 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/media-libs/libdv/files/libdv-0.104-amd64reloc.patch b/media-libs/libdv/files/libdv-0.104-amd64reloc.patch
deleted file mode 100644
index 671406180773..000000000000
--- a/media-libs/libdv/files/libdv-0.104-amd64reloc.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-Fix from upstream cvs:
-
-2004-12-12 Dan Dennedy <dan@dennedy.org>
-
- * *_x86_64.S: apply patch from Dean Kolosiek to fix linker
- compatibility.
-
---- libdv-0.104/libdv/encode_x86_64.S
-+++ libdv-0.104/libdv/encode_x86_64.S
-@@ -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 */
---- libdv-0.104/libdv/idct_block_mmx_x86_64.S
-+++ libdv-0.104/libdv/idct_block_mmx_x86_64.S
-@@ -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
---- libdv-0.104/libdv/quant_x86_64.S
-+++ libdv-0.104/libdv/quant_x86_64.S
-@@ -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); */
---- libdv-0.104/libdv/vlc_x86_64.S
-+++ libdv-0.104/libdv/vlc_x86_64.S
-@@ -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/media-libs/libdv/files/libdv-0.104-gcc4.patch b/media-libs/libdv/files/libdv-0.104-gcc4.patch
deleted file mode 100644
index bfcd44097e0a..000000000000
--- a/media-libs/libdv/files/libdv-0.104-gcc4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libdv/quant.h.orig 2006-02-07 17:39:08.000000000 +0000
-+++ libdv/quant.h 2006-02-07 17:42:37.000000000 +0000
-@@ -27,7 +27,7 @@
- extern void _dv_quant_88_inverse(dv_coeff_t *block,int qno,int klass);
- extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass,
- dv_248_coeff_t *co);
--extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t offset[], uint8_t shifts[][]);
-+extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t **shifts);
- extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass);
- extern void dv_quant_init (void);
- #ifdef __cplusplus
---- libdv/quant.c.orig 2006-02-07 17:42:57.000000000 +0000
-+++ libdv/quant.c 2006-02-07 17:43:17.000000000 +0000
-@@ -144,7 +144,7 @@
- uint32_t dv_quant_248_mul_tab [2] [22] [64];
- uint32_t dv_quant_88_mul_tab [2] [22] [64];
-
--extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t dv_quant_offset[],uint8_t dv_quant_shifts[][]);
-+extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t *dv_quant_offset,uint8_t **dv_quant_shifts);
- extern void _dv_quant_x86_64(dv_coeff_t *block,int qno,int klass);
- static void quant_248_inverse_std(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
- static void quant_248_inverse_mmx(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
diff --git a/media-libs/libdv/files/libdv-0.104-inline.patch b/media-libs/libdv/files/libdv-0.104-inline.patch
deleted file mode 100644
index 8f6fbeeefdd6..000000000000
--- a/media-libs/libdv/files/libdv-0.104-inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdv/vlc.h~ 2005-11-03 16:30:28.000000000 +0900
-+++ libdv/vlc.h 2005-11-03 16:29:38.000000000 +0900
-@@ -69,7 +69,7 @@
- extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result);
- extern void __dv_decode_vlc(int bits, dv_vlc_t *result);
-
--extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
-+static __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
- if(maxbits < 16)
- dv_decode_vlc(bitstream_show(bs,16),maxbits,result);
- else
diff --git a/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch b/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch
deleted file mode 100644
index 7abb35c74c2f..000000000000
--- a/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library. That's bad, mmmkay.
-
-Upstream has already fixed this in their cvs.
-
---- libdv/dct_block_mmx.S
-+++ libdv/dct_block_mmx.S
-@@ -1207,3 +1207,7 @@ _dv_dct_block_mmx_postscale_248:
- popl %esi
- popl %ebp
- ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/dct_block_mmx_x86_64.S
-+++ libdv/dct_block_mmx_x86_64.S
-@@ -1197,3 +1197,7 @@ _dv_dct_block_mmx_x86_64_postscale_248:
- pop %r12
-
- ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/encode_x86.S
-+++ libdv/encode_x86.S
-@@ -599,3 +599,6 @@ _dv_need_dct_248_mmx_rows:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/encode_x86_64.S
-+++ libdv/encode_x86_64.S
-@@ -600,3 +600,6 @@ _dv_need_dct_248_mmx_x86_64_rows:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/idct_block_mmx.S
-+++ libdv/idct_block_mmx.S
-@@ -648,3 +648,6 @@ x0:
- .long 0,0
- .align 8
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/idct_block_mmx_x86_64.S
-+++ libdv/idct_block_mmx_x86_64.S
-@@ -653,3 +653,6 @@ x0:
- .long 0,0
- .align 8
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/quant_x86.S
-+++ libdv/quant_x86.S
-@@ -454,3 +454,6 @@ _dv_quant_x86:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/quant_x86_64.S
-+++ libdv/quant_x86_64.S
-@@ -459,3 +459,6 @@ _dv_quant_x86_64:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/rgbtoyuv.S
-+++ libdv/rgbtoyuv.S
-@@ -1430,3 +1430,6 @@ video_copy_ntsc_c_block_mmx_loop:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/rgbtoyuv_x86_64.S
-+++ libdv/rgbtoyuv_x86_64.S
-@@ -1370,3 +1370,6 @@ video_copy_ntsc_c_block_mmx_loop:
-
-
-
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/transpose_x86.S
-+++ libdv/transpose_x86.S
-@@ -188,3 +188,7 @@ popl %esi
- popl %ebp
-
- ret $0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/transpose_x86_64.S
-+++ libdv/transpose_x86_64.S
-@@ -188,3 +188,7 @@ all_done_ready_to_exit:
- pop %r12
-
- ret $0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/vlc_x86.S
-+++ libdv/vlc_x86.S
-@@ -585,3 +585,7 @@ mod_12:
- .align 16
- const_f_0_0_0:
- .short 0xffff,0,0,0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- libdv/vlc_x86_64.S
-+++ libdv/vlc_x86_64.S
-@@ -671,3 +671,7 @@ mod_12:
- .align 16
- const_f_0_0_0:
- .short 0xffff,0,0,0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/media-libs/libdv/files/libdv-0.104-playdv-segv.patch b/media-libs/libdv/files/libdv-0.104-playdv-segv.patch
deleted file mode 100644
index 6bc02dd056b0..000000000000
--- a/media-libs/libdv/files/libdv-0.104-playdv-segv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-2006-01-15 Dan Dennedy <dan@dennedy.org>
-
- * playdv.c: bugfix segfault on exit due to dv_display_exit()
- being called twice: once in main() and second in atexit
- handler created by dv_display. Thanks for hint provided
- by Jean-Francois Panisset.
-
-Index: playdv/playdv.c
-===================================================================
-RCS file: /cvsroot/libdv/libdv/playdv/playdv.c,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -p -r1.14 -r1.15
---- playdv/playdv.c 23 Nov 2003 22:59:08 -0000 1.14
-+++ playdv/playdv.c 15 Jan 2006 21:23:15 -0000 1.15
-@@ -511,9 +511,6 @@ restart:
- if(!dv_player->arg_disable_video) {
- dv_display_exit(dv_player->display);
- } /* if */
-- if(!dv_player->arg_disable_audio) {
-- dv_oss_close(dv_player->oss);
-- } /* if */
- dv_decoder_free(dv_player->decoder);
- free(dv_player);
- exit(0);
diff --git a/media-libs/libdv/files/libdv-0.99-disablegtk.patch b/media-libs/libdv/files/libdv-0.99-disablegtk.patch
deleted file mode 100644
index 96d1313e125c..000000000000
--- a/media-libs/libdv/files/libdv-0.99-disablegtk.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -ruN libdv-0.99/Makefile.in libdv-0.99/Makefile.in
---- libdv-0.99/Makefile.in 2003-01-02 09:40:44.000000000 -0800
-+++ libdv-0.99/Makefile.in 2003-08-25 11:16:40.000000000 -0700
-@@ -101,7 +101,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
--SUBDIRS = libdv playdv encodedv
-+SUBDIRS = @subdirs@
-
- AUX_DIST = $(ac_aux_dir)/config.guess \
- $(ac_aux_dir)/config.sub \
-diff -ruN libdv-0.99/configure libdv-0.99/configure
---- libdv-0.99/configure 2003-01-02 09:40:46.000000000 -0800
-+++ libdv-0.99/configure 2003-08-25 11:17:30.000000000 -0700
-@@ -7651,6 +7651,7 @@
-
-
-
-+if $use_gtk; then
- REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
-
- succeeded=no
-@@ -7749,9 +7750,13 @@
- echo "$as_me: error: Library requirements ($REQUIRES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
--
-+fi
- REQUIRES=''
--
-+if $use_gtk; then
-+ subdirs="libdv playdv encodedv"
-+else
-+ subdirs="libdv"
-+fi
-
-
-
-@@ -8362,7 +8367,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lXv $GTK_LIBS $LIBS"
-+LIBS="-lXv -lXext -L/usr/X11R6/lib $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -9978,8 +9983,11 @@
-
-
-
--
-+if $use_gtk; then
- ac_config_files="$ac_config_files Makefile libdv.spec libdv.pc libdv/Makefile playdv/Makefile encodedv/Makefile"
-+else
-+ac_config_files="$ac_config_files Makefile libdv.spec libdv.pc libdv/Makefile"
-+fi
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -10480,6 +10488,7 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- for ac_config_target in $ac_config_targets
- do
-+if test "x$enable_gtktest" = "xyes" ; then
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -10494,6 +10503,20 @@
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-+else
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "libdv.spec" ) CONFIG_FILES="$CONFIG_FILES libdv.spec" ;;
-+ "libdv.pc" ) CONFIG_FILES="$CONFIG_FILES libdv.pc" ;;
-+ "libdv/Makefile" ) CONFIG_FILES="$CONFIG_FILES libdv/Makefile" ;;
-+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ *) { { echo "$as_me:9830: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+fi
- done
-
- # If the user did not use the arguments to specify the items to instantiate,
-@@ -10513,6 +10536,12 @@
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
-
-+if test "x$enable_gtktest" = "xyes" ; then
-+ subdirs="libdv playdv encodedv"
-+else
-+ subdirs="libdv"
-+fi
-+
- # Create a (secure) tmp directory for tmp files.
- : ${TMPDIR=/tmp}
- {
-@@ -10642,6 +10671,7 @@
- s,@REQUIRES_NOPKGCONFIG@,$REQUIRES_NOPKGCONFIG,;t t
- s,@ac_aux_dir@,$ac_aux_dir,;t t
- s,@RPM_RELEASE@,$RPM_RELEASE,;t t
-+s,@subdirs@,$subdirs,;t t
- CEOF
-
- _ACEOF
diff --git a/media-libs/libdv/libdv-0.101.ebuild b/media-libs/libdv/libdv-0.101.ebuild
deleted file mode 100644
index f06922aa0537..000000000000
--- a/media-libs/libdv/libdv-0.101.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.101.ebuild,v 1.9 2006/03/06 04:52:16 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdv.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc alpha ~hppa ia64 ~mips"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
-
-src_unpack() {
- unpack ${A} && cd "${S}"
- epatch "${FILESDIR}/${PN}-0.99-2.6.patch"
-}
-
-src_compile() {
- local myconf
- myconf="${myconf} `use_with debug`"
- myconf="${myconf} `use_enable gtk` `use_enable gtk gtktest`"
- myconf="${myconf} `use_enable sdl`"
- myconf="${myconf} `use_enable xv`"
-
- unset CFLAGS CXXFLAGS
-
- econf ${myconf} || die "econf failed"
- make || die "compile problem"
-}
-
-src_install () {
- einstall
- dodoc AUTHORS COPYING COPYRIGHT ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.102.ebuild b/media-libs/libdv/libdv-0.102.ebuild
deleted file mode 100644
index 2197c22e597e..000000000000
--- a/media-libs/libdv/libdv-0.102.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.102.ebuild,v 1.14 2006/03/06 04:52:16 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdv.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
-
-src_unpack() {
- unpack ${A} && cd "${S}"
- epatch "${FILESDIR}/${PN}-0.99-2.6.patch"
-}
-
-src_compile() {
- local myconf
- myconf="${myconf} `use_with debug`"
- myconf="${myconf} `use_enable gtk` `use_enable gtk gtktest`"
- myconf="${myconf} `use_enable sdl`"
- myconf="${myconf} `use_enable xv`"
-
- unset CFLAGS CXXFLAGS
-
- econf ${myconf} || die "econf failed"
- make || die "compile problem"
-}
-
-src_install () {
- einstall
- dodoc AUTHORS COPYING COPYRIGHT ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild
deleted file mode 100644
index 3ce88f45ec5d..000000000000
--- a/media-libs/libdv/libdv-0.104-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.10 2006/06/05 09:19:22 corsair Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://gentoo/libdv-0.104-pic-fix.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.5 )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
- epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
- epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
- # big patch.. test here hard and fast then push upstream
- epatch "${WORKDIR}"/libdv-0.104-pic-fix.patch
-
- # tiny gcc4 fixes
- epatch "${FILESDIR}"/${PN}-0.104-gcc4.patch
- # fix from fedora
- epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
-
- epatch "${FILESDIR}/${P}-inline.patch"
-
- elibtoolize
- epunt_cxx #74497
-}
-
-src_compile() {
- econf \
- $(use_with debug) \
- $(use_enable gtk) $(use_enable gtk gtktest) \
- $(use_enable sdl) \
- $(use_enable xv) \
- || die "econf failed"
- make || die "compile problem"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.104-r2.ebuild b/media-libs/libdv/libdv-0.104-r2.ebuild
deleted file mode 100644
index 7923c051ff96..000000000000
--- a/media-libs/libdv/libdv-0.104-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r2.ebuild,v 1.10 2006/11/04 11:26:03 vapier Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.5 )
- xv? ( x11-libs/libXv )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( x11-proto/xextproto x11-libs/libXt )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
- epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
- epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
- epatch "${FILESDIR}"/${P}-playdv-segv.patch
- epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
- epatch "${FILESDIR}/"${P}-inline.patch
-
- elibtoolize
- epunt_cxx #74497
-}
-
-src_compile() {
- econf \
- $(use_with debug) \
- $(use_enable gtk) $(use_enable gtk gtktest) \
- $(use_enable sdl) \
- $(use_enable xv) \
- || die "econf failed"
- make || die "compile problem"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.104-r3.ebuild b/media-libs/libdv/libdv-0.104-r3.ebuild
deleted file mode 100644
index e045e734e770..000000000000
--- a/media-libs/libdv/libdv-0.104-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r3.ebuild,v 1.1 2006/11/29 21:22:01 zzam Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/${PN}-0.104-pic.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.5 )
- xv? ( x11-libs/libXv )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( x11-proto/xextproto x11-libs/libXt )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
- epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
- epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
- epatch "${FILESDIR}"/${P}-playdv-segv.patch
- epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
- epatch "${FILESDIR}"/${P}-inline.patch
- epatch "${WORKDIR}"/${PN}-0.104-pic.patch
-
- elibtoolize
- epunt_cxx #74497
-}
-
-src_compile() {
- econf \
- $(use_with debug) \
- $(use_enable gtk) $(use_enable gtk gtktest) \
- $(use_enable sdl) \
- $(use_enable xv) \
- || die "econf failed"
- make || die "compile problem"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.104.ebuild b/media-libs/libdv/libdv-0.104.ebuild
deleted file mode 100644
index e45f99d55626..000000000000
--- a/media-libs/libdv/libdv-0.104.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.7 2006/03/06 04:52:16 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sparc ~x86"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.5 )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
- epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
- epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
- epunt_cxx #74497
-}
-
-src_compile() {
- econf \
- $((use x86 && has_pic) && echo --disable-asm) \
- $(use_with debug) \
- $(use_enable gtk) $(use_enable gtk gtktest) \
- $(use_enable sdl) \
- $(use_enable xv) \
- || die "econf failed"
- make || die "compile problem"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-libs/libdv/libdv-0.99-r1.ebuild b/media-libs/libdv/libdv-0.99-r1.ebuild
deleted file mode 100644
index 0f66eb7cf507..000000000000
--- a/media-libs/libdv/libdv-0.99-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.99-r1.ebuild,v 1.15 2006/03/06 04:52:16 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdv.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa"
-IUSE="debug gtk sdl xv"
-
-RDEPEND="dev-libs/popt
- gtk? ( =x11-libs/gtk+-1.2* )
- sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
- xv? ( || ( x11-libs/libXv virtual/x11 ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gtk? ( || ( ( x11-proto/xextproto x11-libs/libXt ) virtual/x11 ) )"
-
-src_unpack() {
- unpack ${A} && cd "${S}"
- epatch "${FILESDIR}/${P}-disablegtk.patch"
- epatch "${FILESDIR}/${P}-2.6.patch"
-}
-
-src_compile() {
- local myconf
- myconf="${myconf} `use_with debug`"
- myconf="${myconf} `use_enable gtk` `use_enable gtk gtktest`"
- myconf="${myconf} `use_enable sdl`"
- myconf="${myconf} `use_enable xv`"
-
- unset CFLAGS CXXFLAGS
-
- econf ${myconf} || die "econf failed"
- make || die "compile problem"
-}
-
-src_install () {
- einstall
- dodoc AUTHORS COPYING COPYRIGHT ChangeLog INSTALL NEWS README* TODO
-}