emulators/retroarch: Remove old patches.
This commit is contained in:
nia
parent
1fcea61f41
commit
9623f90bba
8 changed files with 0 additions and 169 deletions
|
|
@ -1,24 +0,0 @@
|
|||
$NetBSD: patch-Makefile.common,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
|
||||
|
||||
--- Makefile.common.orig 2015-02-03 06:43:44.000000000 +0000
|
||||
+++ Makefile.common
|
||||
@@ -205,9 +205,7 @@ endif
|
||||
|
||||
ifeq ($(HAVE_OSS), 1)
|
||||
OBJ += audio/drivers/oss.o
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(HAVE_OSS_BSD), 1)
|
||||
+else ifeq ($(HAVE_OSS_BSD), 1)
|
||||
OBJ += audio/drivers/oss.o
|
||||
endif
|
||||
|
||||
@@ -418,7 +416,7 @@ ifeq ($(HAVE_OPENGL), 1)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_X11), 1)
|
||||
- ifeq ($(HAVE_GLES), 0)
|
||||
+ ifneq ($(HAVE_GLES), 1)
|
||||
OBJ += gfx/drivers_context/glx_ctx.o
|
||||
endif
|
||||
ifeq ($(HAVE_EGL), 1)
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-audio_audio__utils.c,v 1.1 2015/04/21 17:18:01 joerg Exp $
|
||||
|
||||
--- audio/audio_utils.c.orig 2015-04-17 14:35:27.000000000 +0000
|
||||
+++ audio/audio_utils.c
|
||||
@@ -216,7 +216,7 @@ void audio_convert_float_to_s16_altivec(
|
||||
}
|
||||
audio_convert_float_to_s16_C(out, in, samples_in);
|
||||
}
|
||||
-#elif defined(__ARM_NEON__)
|
||||
+#elif defined(HAVE_NEON)
|
||||
/* Avoid potential hard-float/soft-float ABI issues. */
|
||||
void audio_convert_s16_float_asm(float *out, const int16_t *in,
|
||||
size_t samples, const float *gain);
|
||||
@@ -402,7 +402,7 @@ void audio_convert_float_to_s16_ALLEGREX
|
||||
**/
|
||||
void audio_convert_init_simd(void)
|
||||
{
|
||||
-#if defined(__ARM_NEON__)
|
||||
+#if defined(HAVE_NEON)
|
||||
unsigned cpu = rarch_get_cpu_features();
|
||||
audio_convert_s16_to_float_arm = cpu & RETRO_SIMD_NEON ?
|
||||
audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C;
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-audio_audio__utils.h,v 1.1 2015/04/21 17:18:01 joerg Exp $
|
||||
|
||||
--- audio/audio_utils.h.orig 2015-04-17 14:35:56.000000000 +0000
|
||||
+++ audio/audio_utils.h
|
||||
@@ -93,7 +93,7 @@ void audio_convert_s16_to_float_altivec(
|
||||
void audio_convert_float_to_s16_altivec(int16_t *out,
|
||||
const float *in, size_t samples);
|
||||
|
||||
-#elif defined(__ARM_NEON__)
|
||||
+#elif defined(HAVE_NEON)
|
||||
#define audio_convert_s16_to_float audio_convert_s16_to_float_arm
|
||||
#define audio_convert_float_to_s16 audio_convert_float_to_s16_arm
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-audio_drivers__resampler_cc__resampler.c,v 1.1 2015/04/21 17:18:01 joerg Exp $
|
||||
|
||||
--- audio/drivers_resampler/cc_resampler.c.orig 2015-04-17 14:34:27.000000000 +0000
|
||||
+++ audio/drivers_resampler/cc_resampler.c
|
||||
@@ -388,7 +388,7 @@ static void resampler_CC_upsample(void *
|
||||
}
|
||||
|
||||
|
||||
-#elif defined (__ARM_NEON__)
|
||||
+#elif defined (HAVE_NEON)
|
||||
|
||||
#define CC_RESAMPLER_IDENT "NEON"
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
$NetBSD: patch-audio_drivers__resampler_sinc.c,v 1.1 2015/04/21 17:18:01 joerg Exp $
|
||||
|
||||
--- audio/drivers_resampler/sinc.c.orig 2015-02-03 06:43:44.000000000 +0000
|
||||
+++ audio/drivers_resampler/sinc.c
|
||||
@@ -399,7 +399,7 @@ static void process_sinc(rarch_sinc_resa
|
||||
/* movehl { X, R, X, L } == { X, R, X, R } */
|
||||
_mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
|
||||
}
|
||||
-#elif defined(__ARM_NEON__)
|
||||
+#elif defined(HAVE_NEON)
|
||||
|
||||
#if SINC_COEFF_LERP
|
||||
#error "NEON asm does not support SINC lerp."
|
||||
@@ -504,7 +504,7 @@ static void *resampler_sinc_new(const st
|
||||
}
|
||||
|
||||
/* Be SIMD-friendly. */
|
||||
-#if (defined(__AVX__) && ENABLE_AVX) || defined(__ARM_NEON__)
|
||||
+#if (defined(__AVX__) && ENABLE_AVX) || defined(HAVE_NEON)
|
||||
re->taps = (re->taps + 7) & ~7;
|
||||
#else
|
||||
re->taps = (re->taps + 3) & ~3;
|
||||
@@ -532,7 +532,7 @@ static void *resampler_sinc_new(const st
|
||||
RARCH_LOG("Sinc resampler [AVX]\n");
|
||||
#elif defined(__SSE__)
|
||||
RARCH_LOG("Sinc resampler [SSE]\n");
|
||||
-#elif defined(__ARM_NEON__)
|
||||
+#elif defined(HAVE_NEON)
|
||||
process_sinc_func = mask & RESAMPLER_SIMD_NEON
|
||||
? process_sinc_neon : process_sinc_C;
|
||||
RARCH_LOG("Sinc resampler [%s]\n",
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
$NetBSD: patch-performance.c,v 1.1 2015/04/21 17:18:01 joerg Exp $
|
||||
|
||||
--- performance.c.orig 2015-04-17 14:36:16.000000000 +0000
|
||||
+++ performance.c
|
||||
@@ -306,7 +306,7 @@ static uint64_t xgetbv_x86(uint32_t idx)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__ARM_NEON__)
|
||||
+#if defined(HAVE_NEON)
|
||||
static void arm_enable_runfast_mode(void)
|
||||
{
|
||||
/* RunFast mode. Enables flush-to-zero and some
|
||||
@@ -464,7 +464,7 @@ uint64_t rarch_get_cpu_features(void)
|
||||
uint64_t cpu_flags = android_getCpuFeatures();
|
||||
(void)cpu_flags;
|
||||
|
||||
-#ifdef __ARM_NEON__
|
||||
+#ifdef HAVE_NEON
|
||||
if (cpu_flags & ANDROID_CPU_ARM_FEATURE_NEON)
|
||||
{
|
||||
cpu |= RETRO_SIMD_NEON;
|
||||
@@ -472,7 +472,7 @@ uint64_t rarch_get_cpu_features(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#elif defined(__ARM_NEON__)
|
||||
+#elif defined(HAVE_NEON)
|
||||
cpu |= RETRO_SIMD_NEON;
|
||||
arm_enable_runfast_mode();
|
||||
#elif defined(__ALTIVEC__)
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-qb_config.libs.sh,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
|
||||
|
||||
--- qb/config.libs.sh.orig 2015-02-03 06:43:44.000000000 +0000
|
||||
+++ qb/config.libs.sh
|
||||
@@ -99,7 +99,7 @@ if [ "$HAVE_EGL" != "no" ]; then
|
||||
# some systems have EGL libs, but no pkgconfig
|
||||
if [ "$HAVE_EGL" = "no" ]; then
|
||||
HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS"
|
||||
- [ "$HAVE_EGL" = "yes" ] && EGL_LIBS=-lEGL
|
||||
+ [ "$HAVE_EGL" = "yes" ] && EGL_LIBS="-lEGL $EXTRA_GL_LIBS"
|
||||
else
|
||||
EGL_LIBS="$EGL_LIBS $EXTRA_GL_LIBS"
|
||||
fi
|
||||
@@ -278,7 +278,7 @@ if [ "$HAVE_EGL" = "yes" ]; then
|
||||
add_define_make GLES_CFLAGS "$GLES_CFLAGS"
|
||||
else
|
||||
HAVE_GLES=auto check_pkgconf GLES glesv2
|
||||
- [ "$HAVE_GLES" = "no" ] && HAVE_GLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make GLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS"
|
||||
+ [ "$HAVE_GLES" = "no" -o "$HAVE_GLES" = "auto" ] && HAVE_GLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make GLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS" && HAVE_GLES=yes
|
||||
fi
|
||||
fi
|
||||
if [ "$HAVE_VG" != "no" ]; then
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-qb_qb.libs.sh,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
|
||||
|
||||
--- qb/qb.libs.sh.orig 2015-02-03 06:43:44.000000000 +0000
|
||||
+++ qb/qb.libs.sh
|
||||
@@ -17,7 +17,7 @@ add_include_dirs()
|
||||
{ while [ "$1" ]; do INCLUDE_DIRS="$INCLUDE_DIRS -I$1"; shift; done;}
|
||||
|
||||
add_library_dirs()
|
||||
-{ while [ "$1" ]; do LIBRARY_DIRS="$LIBRARY_DIRS -L$1"; shift; done;}
|
||||
+{ while [ "$1" ]; do LIBRARY_DIRS="$LIBRARY_DIRS -Wl,-R$1 -L$1"; shift; done;}
|
||||
|
||||
check_lib() #$1 = HAVE_$1 $2 = lib $3 = function in lib $4 = extralibs $5 = headers
|
||||
{ tmpval="$(eval echo \$HAVE_$1)"
|
||||
Loading…
Reference in a new issue