[Pkg-sdl-commits] r73 - in unstable/libsdl1.2/debian: . patches
Samuel Hocevar
sho at costa.debian.org
Wed May 31 16:16:14 CEST 2006
Author: sho
Date: 2006-05-31 14:16:13 +0000 (Wed, 31 May 2006)
New Revision: 73
Modified:
unstable/libsdl1.2/debian/changelog
unstable/libsdl1.2/debian/patches/000_nasm_include.diff
unstable/libsdl1.2/debian/patches/013_hermes_pic_support.diff
unstable/libsdl1.2/debian/patches/series
Log:
* debian/patches/000_nasm_include.diff:
+ Feed -I$(srcdir)/src/hermes/ instead of -I$(srcdir)/ to nasm due to
upstream's new build system.
* libsdl1.2/debian/patches/000_nasm_include.diff:
+ Re-enabled patch.
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2006-05-31 12:03:46 UTC (rev 72)
+++ unstable/libsdl1.2/debian/changelog 2006-05-31 14:16:13 UTC (rev 73)
@@ -40,17 +40,21 @@
+ Removed deprecated patch. Upstream now builds both static and shared
libraries.
+ * debian/patches/000_nasm_include.diff:
+ + Feed -I$(srcdir)/src/hermes/ instead of -I$(srcdir)/ to nasm due to
+ upstream's new build system.
+
* debian/patches/000_autogen_autotools_fix.diff:
- * debian/patches/000_nasm_include.diff:
* debian/patches/000_relibtoolize.diff:
* debian/patches/011_mprotect.diff:
- + Fixed and refreshed patches.
+ + Refreshed patches.
* debian/patches/013_hermes_pic_support.diff:
- + Temporarily disabled unappliable patch. Upstream is working on a
- different solution, but keep it around just in case.
+ + Refreshed patch. Unfortunately upstream tried to solve the PIC problem
+ in a different way, which makes this patch useless for now. It needs
+ to be updated.
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 13 May 2006 23:12:38 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 31 May 2006 14:57:38 +0200
libsdl1.2 (1.2.9-5) unstable; urgency=low
Modified: unstable/libsdl1.2/debian/patches/000_nasm_include.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/000_nasm_include.diff 2006-05-31 12:03:46 UTC (rev 72)
+++ unstable/libsdl1.2/debian/patches/000_nasm_include.diff 2006-05-31 14:16:13 UTC (rev 73)
@@ -7,7 +7,7 @@
asm) cat >>${output}.new <<__EOF__
- \$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) $src -o \$@
-+ \$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) -I\$(srcdir)/ $src -o \$@
++ \$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) -I\$(srcdir)/src/hermes/ $src -o \$@
__EOF__
;;
Modified: unstable/libsdl1.2/debian/patches/013_hermes_pic_support.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/013_hermes_pic_support.diff 2006-05-31 12:03:46 UTC (rev 72)
+++ unstable/libsdl1.2/debian/patches/013_hermes_pic_support.diff 2006-05-31 14:16:13 UTC (rev 73)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.9+0/src/hermes/common.asm
+Index: libsdl1.2-1.2.10/src/hermes/common.asm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libsdl1.2-1.2.9+0/src/hermes/common.asm 2006-05-13 18:18:21.000000000 +0200
++++ libsdl1.2-1.2.10/src/hermes/common.asm 2006-05-31 15:22:16.000000000 +0200
@@ -0,0 +1,84 @@
+;
+; PIC support for HERMES
@@ -87,10 +87,10 @@
+ %endmacro
+%endif
+
-Index: libsdl1.2-1.2.9+0/src/hermes/mmxp2_32.asm
+Index: libsdl1.2-1.2.10/src/hermes/mmxp2_32.asm
===================================================================
---- libsdl1.2-1.2.9+0.orig/src/hermes/mmxp2_32.asm 2006-05-13 18:18:17.000000000 +0200
-+++ libsdl1.2-1.2.9+0/src/hermes/mmxp2_32.asm 2006-05-13 18:18:21.000000000 +0200
+--- libsdl1.2-1.2.10.orig/src/hermes/mmxp2_32.asm 2006-05-01 10:02:38.000000000 +0200
++++ libsdl1.2-1.2.10/src/hermes/mmxp2_32.asm 2006-05-31 15:32:58.000000000 +0200
@@ -18,6 +18,8 @@
; are, they're terrible on p5 MMXs, but less so on pIIs. Someone needs to
; optimise them for p5 MMXs..
@@ -100,137 +100,17 @@
BITS 32
-@@ -52,8 +54,9 @@
-
- _ConvertMMXpII32_24RGB888:
-
-+ picgetgot edx ; edx is not used yet
- ; set up mm6 as the mask, mm7 as zero
-- movq mm6, qword [mmx32_rgb888_mask]
-+ movq mm6, qword [mmx32_rgb888_mask GOT_edx]
- pxor mm7, mm7
-
- mov edx, ecx ; save ecx
-@@ -108,16 +111,18 @@
- dec ecx
+@@ -259,7 +263,8 @@
jnz .L3
- .L4:
-- jmp _mmxreturn
-+ picgetgot ecx
-+ picjmp ecx, _mmxreturn
-
-
- _ConvertMMXpII32_16RGB565:
-
-+ picgetgot edx ; edx is not used yet
- ; set up masks
-- movq mm5, [mmx32_rgb565_b]
-- movq mm6, [mmx32_rgb565_g]
-- movq mm7, [mmx32_rgb565_r]
-+ movq mm5, [mmx32_rgb565_b GOT_edx]
-+ movq mm6, [mmx32_rgb565_g GOT_edx]
-+ movq mm7, [mmx32_rgb565_r GOT_edx]
-
- mov edx, ecx
- shr ecx, 2
-@@ -176,14 +181,16 @@
- jnz .L3
-
.L4:
-- jmp _mmxreturn
-+ picgetgot ecx
-+ picjmp ecx, _mmxreturn
-
-
- _ConvertMMXpII32_16BGR565:
-
-- movq mm5, [mmx32_rgb565_r]
-- movq mm6, [mmx32_rgb565_g]
-- movq mm7, [mmx32_rgb565_b]
-+ picgetgot edx ; edx is not used yet
-+ movq mm5, [mmx32_rgb565_r GOT_edx]
-+ movq mm6, [mmx32_rgb565_g GOT_edx]
-+ movq mm7, [mmx32_rgb565_b GOT_edx]
-
- mov edx, ecx
- shr ecx, 2
-@@ -245,7 +252,8 @@
- jnz .L3
-
- .L4:
- jmp _mmxreturn
+ picgetgot ecx
+ picjmp ecx, _mmxreturn
_ConvertMMXpII32_16BGR555:
-@@ -253,7 +261,8 @@
- ; except it uses a different multiplier for the pmaddwd
- ; instruction. cool huh.
-
-- movq mm7, qword [mmx32_bgr555_mul]
-+ picgetgot ebx ; ebx is not used yet
-+ movq mm7, qword [mmx32_bgr555_mul GOT_ebx]
- jmp _convert_bgr555_cheat
-
- ; This is the same as the Intel version.. they obviously went to
-@@ -263,9 +272,10 @@
- ; (I think) a more accurate name..
- _ConvertMMXpII32_16RGB555:
-
-- movq mm7,qword [mmx32_rgb555_mul]
-+ picgetgot ebx ; ebx is not used yet
-+ movq mm7,qword [mmx32_rgb555_mul GOT_ebx]
- _convert_bgr555_cheat:
-- movq mm6,qword [mmx32_rgb555_g]
-+ movq mm6,qword [mmx32_rgb555_g GOT_ebx]
-
- mov edx,ecx ; Save ecx
-
-@@ -280,10 +290,10 @@
- movq mm0,[esi]
- movq mm3,mm2
-
-- pand mm3,qword [mmx32_rgb555_rb]
-+ pand mm3,qword [mmx32_rgb555_rb GOT_ebx]
- movq mm1,mm0
-
-- pand mm1,qword [mmx32_rgb555_rb]
-+ pand mm1,qword [mmx32_rgb555_rb GOT_ebx]
- pmaddwd mm3,mm7
-
- pmaddwd mm1,mm7
-@@ -302,13 +312,13 @@
- movq mm0,mm4
- psrld mm1,6
-
-- pand mm0,qword [mmx32_rgb555_rb]
-+ pand mm0,qword [mmx32_rgb555_rb GOT_ebx]
- packssdw mm1,mm3
-
- movq mm3,mm5
- pmaddwd mm0,mm7
-
-- pand mm3,qword [mmx32_rgb555_rb]
-+ pand mm3,qword [mmx32_rgb555_rb GOT_ebx]
- pand mm4,mm6
-
- movq [edi],mm1
-@@ -329,10 +339,10 @@
- movq mm3,mm2
- movq mm1,mm0
-
-- pand mm3,qword [mmx32_rgb555_rb]
-+ pand mm3,qword [mmx32_rgb555_rb GOT_ebx]
- packssdw mm5,mm4
-
-- pand mm1,qword [mmx32_rgb555_rb]
-+ pand mm1,qword [mmx32_rgb555_rb GOT_ebx]
- pand mm2,mm6
-
- movq [edi+8],mm5
-@@ -380,7 +390,8 @@
+@@ -399,7 +404,8 @@
jnz .L3
.L4:
@@ -238,12 +118,12 @@
+ picgetgot ecx
+ picjmp ecx, _mmxreturn
-
%ifidn __OUTPUT_FORMAT__,elf
-Index: libsdl1.2-1.2.9+0/src/hermes/x86_main.asm
+ section .note.GNU-stack noalloc noexec nowrite progbits
+Index: libsdl1.2-1.2.10/src/hermes/x86_main.asm
===================================================================
---- libsdl1.2-1.2.9+0.orig/src/hermes/x86_main.asm 2006-05-13 18:18:17.000000000 +0200
-+++ libsdl1.2-1.2.9+0/src/hermes/x86_main.asm 2006-05-13 18:18:21.000000000 +0200
+--- libsdl1.2-1.2.10.orig/src/hermes/x86_main.asm 2006-05-01 10:02:38.000000000 +0200
++++ libsdl1.2-1.2.10/src/hermes/x86_main.asm 2006-05-31 15:22:16.000000000 +0200
@@ -9,6 +9,8 @@
; Most routines are (c) Glenn Fiedler (ptc at gaffer.org), used with permission
;
@@ -253,46 +133,10 @@
BITS 32
GLOBAL _ConvertX86
-@@ -17,11 +19,6 @@
- GLOBAL _Hermes_X86_CPU
-
-
--SECTION .data
--
--cpu_flags dd 0
--
--
- SECTION .text
-
- ;; _ConvertX86:
-@@ -110,16 +107,18 @@
- xor eax,ecx
- je .L1
-
-- pusha
-+ push ebx
-+ push ecx
-+ push edx
-
- mov eax,1
- cpuid
-
-- mov [cpu_flags],edx
--
-- popa
-+ mov eax,edx
-
-- mov eax,[cpu_flags]
-+ pop edx
-+ pop ecx
-+ pop ebx
-
- .L1:
- ret
-Index: libsdl1.2-1.2.9+0/src/hermes/x86p_16.asm
+Index: libsdl1.2-1.2.10/src/hermes/x86p_16.asm
===================================================================
---- libsdl1.2-1.2.9+0.orig/src/hermes/x86p_16.asm 2006-05-13 18:18:17.000000000 +0200
-+++ libsdl1.2-1.2.9+0/src/hermes/x86p_16.asm 2006-05-13 18:18:21.000000000 +0200
+--- libsdl1.2-1.2.10.orig/src/hermes/x86p_16.asm 2006-05-01 10:02:38.000000000 +0200
++++ libsdl1.2-1.2.10/src/hermes/x86p_16.asm 2006-05-31 15:22:16.000000000 +0200
@@ -10,7 +10,8 @@
; Used with permission.
;
@@ -303,7 +147,7 @@
BITS 32
GLOBAL _ConvertX86p16_32RGB888
-@@ -57,7 +58,8 @@
+@@ -54,7 +55,8 @@
dec ecx
jnz .L1
.L2
@@ -313,7 +157,7 @@
.L3 ; head
mov eax,edi
-@@ -135,7 +137,8 @@
+@@ -132,7 +134,8 @@
add edi,BYTE 2
.L7
@@ -323,7 +167,7 @@
-@@ -164,7 +167,8 @@
+@@ -161,7 +164,8 @@
dec ecx
jnz .L1
.L2
@@ -333,7 +177,7 @@
.L3 ; head
mov eax,edi
-@@ -243,7 +247,8 @@
+@@ -240,7 +244,8 @@
jmp SHORT .L6
.L7 pop ebp
@@ -343,7 +187,7 @@
-@@ -277,7 +282,8 @@
+@@ -274,7 +279,8 @@
dec ecx
jnz .L1
.L2
@@ -353,7 +197,7 @@
.L3 ; head
mov eax,edi
-@@ -361,7 +367,8 @@
+@@ -358,7 +364,8 @@
add edi,BYTE 2
.L7
@@ -363,7 +207,7 @@
-@@ -394,7 +401,8 @@
+@@ -391,7 +398,8 @@
dec ecx
jnz .L1
.L2
@@ -373,7 +217,7 @@
.L3 mov eax,edi
and eax,BYTE 11b
-@@ -492,7 +500,8 @@
+@@ -489,7 +497,8 @@
jnz .L6
.L7 pop ebp
@@ -383,10 +227,10 @@
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
-Index: libsdl1.2-1.2.9+0/src/hermes/x86p_32.asm
+Index: libsdl1.2-1.2.10/src/hermes/x86p_32.asm
===================================================================
---- libsdl1.2-1.2.9+0.orig/src/hermes/x86p_32.asm 2006-05-13 18:18:17.000000000 +0200
-+++ libsdl1.2-1.2.9+0/src/hermes/x86p_32.asm 2006-05-13 18:18:21.000000000 +0200
+--- libsdl1.2-1.2.10.orig/src/hermes/x86p_32.asm 2006-05-01 10:02:38.000000000 +0200
++++ libsdl1.2-1.2.10/src/hermes/x86p_32.asm 2006-05-31 15:22:16.000000000 +0200
@@ -9,6 +9,7 @@
; Most routines are (c) Glenn Fiedler (ptc at gaffer.org), used with permission
;
@@ -395,7 +239,7 @@
BITS 32
-@@ -53,7 +54,8 @@
+@@ -52,7 +53,8 @@
dec ecx
jnz .L1
.L2
@@ -405,7 +249,7 @@
.L3 ; save ebp
push ebp
-@@ -113,7 +115,8 @@
+@@ -112,7 +114,8 @@
jnz .L5
.L6 pop ebp
@@ -415,7 +259,7 @@
-@@ -133,7 +136,8 @@
+@@ -132,7 +135,8 @@
dec ecx
jnz .L1
.L2
@@ -425,7 +269,7 @@
.L3 ; save ebp
push ebp
-@@ -184,7 +188,8 @@
+@@ -183,7 +187,8 @@
jnz .L5
.L6 pop ebp
@@ -435,7 +279,7 @@
-@@ -204,7 +209,8 @@
+@@ -203,7 +208,8 @@
dec ecx
jnz .L1
.L2
@@ -445,7 +289,7 @@
.L3 ; save ebp
push ebp
-@@ -257,7 +263,8 @@
+@@ -256,7 +262,8 @@
jnz .L5
.L6 pop ebp
@@ -455,7 +299,7 @@
-@@ -282,7 +289,8 @@
+@@ -281,7 +288,8 @@
dec ecx
jnz .L1
.L2
@@ -465,7 +309,7 @@
.L3 ; head
mov edx,edi
-@@ -354,7 +362,8 @@
+@@ -353,7 +361,8 @@
jnz .L6
.L7 pop ebp
@@ -475,7 +319,7 @@
-@@ -380,7 +389,8 @@
+@@ -379,7 +388,8 @@
dec ecx
jnz .L1
.L2
@@ -485,7 +329,7 @@
.L3 ; head
mov edx,edi
-@@ -455,7 +465,8 @@
+@@ -454,7 +464,8 @@
.L7
pop ebp
@@ -495,7 +339,7 @@
-@@ -484,7 +495,8 @@
+@@ -483,7 +494,8 @@
jnz .L1
.L2: ; End of short loop
@@ -505,7 +349,7 @@
.L3 ; head
-@@ -570,7 +582,8 @@
+@@ -569,7 +581,8 @@
add edi,BYTE 2
.L7:
@@ -515,7 +359,7 @@
-@@ -599,7 +612,8 @@
+@@ -598,7 +611,8 @@
dec ecx
jnz .L1
.L2
@@ -525,7 +369,7 @@
.L3 ; head
mov ebx,edi
-@@ -684,7 +698,8 @@
+@@ -683,7 +697,8 @@
add edi,BYTE 2
.L7
@@ -535,7 +379,7 @@
-@@ -713,7 +728,8 @@
+@@ -712,7 +727,8 @@
dec ecx
jnz .L1
.L2
@@ -545,7 +389,7 @@
.L3 ; head
mov ebx,edi
-@@ -795,7 +811,8 @@
+@@ -794,7 +810,8 @@
add edi,BYTE 2
.L7
@@ -555,7 +399,7 @@
-@@ -825,7 +842,8 @@
+@@ -824,7 +841,8 @@
dec ecx
jnz .L1
.L2
@@ -565,7 +409,7 @@
.L3 ; head
mov ebx,edi
-@@ -910,7 +928,8 @@
+@@ -909,7 +927,8 @@
add edi,BYTE 2
.L7
@@ -575,7 +419,7 @@
-@@ -1040,7 +1059,8 @@
+@@ -1039,7 +1058,8 @@
jnz .L3
.L4:
Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series 2006-05-31 12:03:46 UTC (rev 72)
+++ unstable/libsdl1.2/debian/patches/series 2006-05-31 14:16:13 UTC (rev 73)
@@ -8,6 +8,6 @@
006_gcc4_compilation_fix.diff
009_alsa_priority.diff
011_mprotect.diff
-#013_hermes_pic_support.diff
+013_hermes_pic_support.diff
014_missing_mmx_blit.diff
015_kfreebsd_gnu.diff
More information about the Pkg-sdl-commits
mailing list