mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
83 lines
4.4 KiB
Plaintext
83 lines
4.4 KiB
Plaintext
From 1204da7c5540fbbaefa1a03917b04643a98b4a37 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sat, 29 Apr 2017 09:43:40 +0200
|
|
Subject: import patch from v3.15.3
|
|
|
|
|
|
diff --git a/Makefile.gnu b/Makefile.gnu
|
|
index 92f6358..9d136c6 100644
|
|
--- a/Makefile.gnu
|
|
+++ b/Makefile.gnu
|
|
@@ -71,9 +71,9 @@ $(SHAREDLIB): $(MODULES)
|
|
|
|
install:
|
|
install -d $(INCDIR) $(INSTALLDIR)
|
|
- install -m 644 -o root -g root $(HEADER) $(INCDIR)
|
|
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
|
|
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
|
|
+ install -m 644 $(HEADER) $(INCDIR)
|
|
+ install -m 644 $(STATICLIB) $(INSTALLDIR)
|
|
+ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
|
|
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
|
|
ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
|
|
# ldconfig
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From f11e0f9976877c02fbb062fddf4b0e081693888c Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sat, 29 Apr 2017 09:49:37 +0200
|
|
Subject: fix raw string literal
|
|
|
|
|
|
diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
|
index a7864a0..cb3adfe 100644
|
|
--- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
|
+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
|
@@ -34,15 +34,15 @@
|
|
G = G - t2 + kGCst; \
|
|
B = B + kBCst; \
|
|
__asm__ volatile ( \
|
|
- "shll_s.w %["#R"], %["#R"], 9 \n\t" \
|
|
- "shll_s.w %["#G"], %["#G"], 9 \n\t" \
|
|
- "shll_s.w %["#B"], %["#B"], 9 \n\t" \
|
|
- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \
|
|
- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \
|
|
- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \
|
|
- "srl %["#R"], %["#R"], 24 \n\t" \
|
|
- "srl %["#G"], %["#G"], 24 \n\t" \
|
|
- "srl %["#B"], %["#B"], 24 \n\t" \
|
|
+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \
|
|
+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \
|
|
+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \
|
|
+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \
|
|
+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \
|
|
+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \
|
|
+ "srl %[" #R "], %[" #R "], 24 \n\t" \
|
|
+ "srl %[" #G "], %[" #G "], 24 \n\t" \
|
|
+ "srl %[" #B "], %[" #B "], 24 \n\t" \
|
|
: [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \
|
|
: \
|
|
); \
|
|
diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
|
index 66adde5..43990a0 100644
|
|
--- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
|
+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
|
@@ -54,9 +54,9 @@
|
|
"srl %[temp5], %[temp5], 24 \n\t" \
|
|
"srl %[temp6], %[temp6], 24 \n\t" \
|
|
"srl %[temp7], %[temp7], 24 \n\t" \
|
|
- "sb %[temp5], "#R"(%[dst]) \n\t" \
|
|
- "sb %[temp6], "#G"(%[dst]) \n\t" \
|
|
- "sb %[temp7], "#B"(%[dst]) \n\t" \
|
|
+ "sb %[temp5], " #R "(%[dst]) \n\t" \
|
|
+ "sb %[temp6], " #G "(%[dst]) \n\t" \
|
|
+ "sb %[temp7], " #B "(%[dst]) \n\t" \
|
|
|
|
#define ASM_CLOBBER_LIST() \
|
|
: [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \
|
|
--
|
|
2.7.0
|
|
|