summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-09-17 20:44:30 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2020-09-19 00:08:01 +0530
commit16a76665ce25478c73b06baf3b3c8d4c038c4a62 (patch)
tree8112d5a672ebd2b9dcd907ffdb0ae30d37e02f1f
parent7a55b396c380c47733b7a38ddae976656cde37f7 (diff)
recipes: Don't build libvisual plugin
The project is extremely out of date, pretty sure no one uses this from our binaries. This is also the only project that currently needs gettext-tools, so removing it will allow us to get rid of that too. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/605>
-rw-r--r--packages/gstreamer-1.0-visualizers.package6
-rw-r--r--recipes/gst-plugins-base-1.0.recipe14
-rw-r--r--recipes/libvisual.recipe30
-rw-r--r--recipes/libvisual/0001-Allow-consuming-the-public-API-using-MSVC.patch49
-rw-r--r--recipes/libvisual/0001-Check-properly-for-sched_setshceduler.patch48
-rw-r--r--recipes/libvisual/0003-Add-long-long-check-for-win64.patch43
-rw-r--r--recipes/libvisual/0005-Fix-compilation-in-win64.patch28
-rw-r--r--recipes/libvisual/0006-Fix-build-in-PPC.patch26
-rw-r--r--recipes/libvisual/0007-Fix-build-on-debian-squeeze.patch42
-rw-r--r--recipes/libvisual/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch27
-rw-r--r--recipes/libvisual/0009-Fix-build-for-Android-X86.patch25
-rw-r--r--recipes/libvisual/0010-Only-define-inline-and-friends-if-they-re-not-define.patch51
-rw-r--r--recipes/libvisual/0011-Fix-autoreconf-when-using-our-gettext-version.patch25
-rw-r--r--recipes/libvisual/0012-configure-gettext-0.18-is-enough-no-0.18.2-needed.patch25
-rw-r--r--recipes/libvisual/0013-Include-lv_cpu.h-for-visual_cpu_initialize.patch24
-rw-r--r--recipes/libvisual/0014-Add-forward-declaration-of-visual_transform_init-as-.patch26
-rw-r--r--recipes/libvisual/0015-Include-lv_cpu.h-in-another-place-too.patch24
-rw-r--r--recipes/libvisual/0016-configure.ac-Use-gettext-0.19.patch25
18 files changed, 3 insertions, 535 deletions
diff --git a/packages/gstreamer-1.0-visualizers.package b/packages/gstreamer-1.0-visualizers.package
index 3159eed5..872ed6d8 100644
--- a/packages/gstreamer-1.0-visualizers.package
+++ b/packages/gstreamer-1.0-visualizers.package
@@ -10,13 +10,9 @@ class Package(custom.GStreamer, package.Package):
uuid = 'b8800fa1-44bb-4a95-87e1-6814cdc62ec3'
deps = ['gstreamer-1.0-core']
- files = ['libvisual', 'gst-plugins-base-1.0:plugins_vis', 'gst-plugins-good-1.0:plugins_vis',
+ files = ['gst-plugins-base-1.0:plugins_vis', 'gst-plugins-good-1.0:plugins_vis',
'gst-plugins-ugly-1.0:plugins_vis', 'gst-plugins-bad-1.0:plugins_vis']
files_devel = ['gst-plugins-base-1.0:plugins_vis_devel',
'gst-plugins-good-1.0:plugins_vis_devel',
'gst-plugins-ugly-1.0:plugins_vis_devel',
'gst-plugins-bad-1.0:plugins_vis_devel']
-
- def prepare(self):
- if self.config.variants.uwp:
- self.files.remove('libvisual')
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index d33a77c9..4b2e9497 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -10,7 +10,6 @@ class Recipe(custom.GStreamer):
'gl-graphene': 'enabled',
'gl-png': 'enabled',
'gl-jpeg': 'enabled',
- 'libvisual': 'enabled',
'ogg': 'enabled',
'opus': 'enabled',
'pango': 'enabled',
@@ -19,7 +18,7 @@ class Recipe(custom.GStreamer):
# disabled plugins
'tremor': 'disabled'}
deps = ['glib', 'gstreamer-1.0', 'libogg', 'pango', 'libtheora',
- 'libvisual', 'libvorbis', 'zlib', 'orc', 'opus', 'graphene',
+ 'libvorbis', 'zlib', 'orc', 'opus', 'graphene',
'libjpeg-turbo', 'libpng']
platform_deps = {Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] }
use_system_libs = True
@@ -107,14 +106,6 @@ class Recipe(custom.GStreamer):
'lib/gstreamer-1.0/libgstopus.a', 'lib/gstreamer-1.0/libgstopus.la',
]
- files_plugins_vis = [
- 'lib/gstreamer-1.0/libgstlibvisual%(mext)s',
- ]
-
- files_plugins_vis_devel = [
- 'lib/gstreamer-1.0/libgstlibvisual.a', 'lib/gstreamer-1.0/libgstlibvisual.la',
- ]
-
files_plugins_devel = [
'include/gstreamer-1.0/gst/allocators',
'include/gstreamer-1.0/gst/app',
@@ -210,8 +201,7 @@ class Recipe(custom.GStreamer):
self.meson_options['tremor'] = 'enabled'
if self.using_uwp():
- # All these except libvisual can be ported to Meson/UWP
- self.disable_plugin('libvisual', 'vis', dep='libvisual')
+ # All these can be ported to Meson/UWP
self.disable_plugin('ogg', 'codecs', dep='libogg')
self.disable_plugin('pango', 'core', dep='pango')
self.disable_plugin('theora', 'codecs', dep='libtheora')
diff --git a/recipes/libvisual.recipe b/recipes/libvisual.recipe
deleted file mode 100644
index b37756fe..00000000
--- a/recipes/libvisual.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
-
-class Recipe(recipe.Recipe):
- name = 'libvisual'
- version = '0.4.0'
- stype = SourceType.TARBALL
- url = 'sf://.tar.bz2'
- tarball_checksum = '78f38d3ce857edde5482aa4415b504bbcd4d4a688fd4de09ec2131ad08174279'
- licenses = [License.LGPLv2_1Plus]
- autoreconf = True
- configure_options = ' --enable-static'
- patches = ['libvisual/0001-Check-properly-for-sched_setshceduler.patch',
- 'libvisual/0003-Add-long-long-check-for-win64.patch',
- 'libvisual/0005-Fix-compilation-in-win64.patch',
- 'libvisual/0006-Fix-build-in-PPC.patch',
- 'libvisual/0007-Fix-build-on-debian-squeeze.patch',
- 'libvisual/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch',
- 'libvisual/0009-Fix-build-for-Android-X86.patch',
- 'libvisual/0010-Only-define-inline-and-friends-if-they-re-not-define.patch',
- 'libvisual/0011-Fix-autoreconf-when-using-our-gettext-version.patch',
- 'libvisual/0012-configure-gettext-0.18-is-enough-no-0.18.2-needed.patch',
- 'libvisual/0013-Include-lv_cpu.h-for-visual_cpu_initialize.patch',
- 'libvisual/0014-Add-forward-declaration-of-visual_transform_init-as-.patch',
- 'libvisual/0015-Include-lv_cpu.h-in-another-place-too.patch',
- 'libvisual/0016-configure.ac-Use-gettext-0.19.patch',
- 'libvisual/0001-Allow-consuming-the-public-API-using-MSVC.patch',]
-
- files_libs = ['libvisual-0.4']
- files_devel = ['include/libvisual-0.4', 'lib/pkgconfig/libvisual-0.4.pc']
diff --git a/recipes/libvisual/0001-Allow-consuming-the-public-API-using-MSVC.patch b/recipes/libvisual/0001-Allow-consuming-the-public-API-using-MSVC.patch
deleted file mode 100644
index 906c2fa8..00000000
--- a/recipes/libvisual/0001-Allow-consuming-the-public-API-using-MSVC.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5d54dab6fd4f1f4433f26b2763c76218753ee31b Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Fri, 22 Feb 2019 02:31:47 +0530
-Subject: [PATCH] Allow consuming the public API using MSVC
-
----
- libvisual/lv_thread.h | 2 +-
- libvisual/lv_time.h | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libvisual/lv_thread.h b/libvisual/lv_thread.h
-index da93ab1..f9adc40 100644
---- a/libvisual/lv_thread.h
-+++ b/libvisual/lv_thread.h
-@@ -63,7 +63,7 @@ struct _VisMutex {
- #ifdef VISUAL_THREAD_MODEL_POSIX
- pthread_mutex_t mutex; /**< Private used for the pthreads implementation. */
- #elif defined(VISUAL_THREAD_MODEL_WIN32) /* !VISUAL_THREAD_MODEL_POSIX */
--
-+ int unused; /* MSVC does not allow empty structs */
- #elif defined(VISUAL_THREAD_MODEL_GTHREAD) /* !VISUAL_THREAD_MODEL_WIN32 */
- GMutex *mutex;
-
-diff --git a/libvisual/lv_time.h b/libvisual/lv_time.h
-index 885448a..e15c194 100644
---- a/libvisual/lv_time.h
-+++ b/libvisual/lv_time.h
-@@ -24,7 +24,9 @@
- #ifndef _LV_TIME_H
- #define _LV_TIME_H
-
-+#ifndef _MSC_VER
- #include <sys/time.h>
-+#endif
- #include <time.h>
-
- #include <libvisual/lv_common.h>
-@@ -103,7 +105,7 @@ int visual_timer_has_passed_by_values (VisTimer *timer, long sec, long usec);
- */
- static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
- {
--#if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
-+#if !defined(_MSC_VER) && (defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64))
- __asm __volatile
- ("\n\t cpuid"
- "\n\t rdtsc"
---
-2.20.1.windows.1
-
diff --git a/recipes/libvisual/0001-Check-properly-for-sched_setshceduler.patch b/recipes/libvisual/0001-Check-properly-for-sched_setshceduler.patch
deleted file mode 100644
index 75f10850..00000000
--- a/recipes/libvisual/0001-Check-properly-for-sched_setshceduler.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7b4afba88a7f5f1d4754d67fe749df02743e2b05 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Tue, 6 Mar 2012 11:32:25 +0100
-Subject: [PATCH 01/16] Check properly for sched_setshceduler
-
-This funtion is not implemented in osx for instance
----
- configure.ac | 2 +-
- libvisual/lv_os.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 71d5773..cd944f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ AC_C_BIGENDIAN(bigendian=yes, bigendian=no, )
- AC_FUNC_MALLOC
- AC_FUNC_REALLOC
- AC_FUNC_SELECT_ARGTYPES
--AC_CHECK_FUNCS([gettimeofday usleep nanosleep select memset sqrt strdup strndup sysconf])
-+AC_CHECK_FUNCS([gettimeofday usleep nanosleep select memset sqrt strdup strndup sysconf sched_setscheduler])
-
- AC_CHECK_LIB([dl], [dlsym], [LIBS="-ldl $LIBS"],
- AC_MSG_WARN([*** You need dlsym() to make use of Libvisual.]))
-diff --git a/libvisual/lv_os.c b/libvisual/lv_os.c
-index 2af04d7..800147e 100644
---- a/libvisual/lv_os.c
-+++ b/libvisual/lv_os.c
-@@ -31,12 +31,16 @@
- #ifdef HAVE_SCHED_H
- # include <sched.h>
- # include <sys/types.h>
-+#ifdef HAVE_SCHED_SETSCHEDULER
- # define HAVE_SCHED 1
-+#endif
- #elif defined HAVE_SYS_SCHED_H
- # include <sys/sched.h>
- # include <sys/types.h>
-+#ifdef HAVE_SCHED_SETSCHEDULER
- # define HAVE_SCHED 1
- #endif
-+#endif
-
- #include "lv_os.h"
-
---
-2.1.4
-
diff --git a/recipes/libvisual/0003-Add-long-long-check-for-win64.patch b/recipes/libvisual/0003-Add-long-long-check-for-win64.patch
deleted file mode 100644
index c5b91406..00000000
--- a/recipes/libvisual/0003-Add-long-long-check-for-win64.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 328509681f4a506b830f0de032d788c68e2ee685 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Tue, 6 Mar 2012 17:36:59 +0100
-Subject: [PATCH 03/16] Add long long check for win64
-
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd944f8..e21483a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,6 +330,7 @@ AC_SUBST(LV_THREAD_CFLAGS)
- AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(long)
-+AC_CHECK_SIZEOF(long long)
- AC_CHECK_SIZEOF(size_t)
-
- dnl Try to figure out whether visual_size should be long or int
-@@ -345,6 +346,9 @@ $ac_cv_sizeof_int)
- $ac_cv_sizeof_long)
- visual_size_type=long
- ;;
-+$ac_cv_sizeof_long_long)
-+ visual_size_type='long long'
-+ ;;
- *) AC_MSG_ERROR([No type matching size_t in size])
- ;;
- esac
-@@ -801,7 +805,7 @@ echo >>$outfile
- lv_have_threads=$have_threads
- lv_enable_threads=$enable_threads
-
--case $visual_size_type in
-+case "$visual_size_type" in
- short)
- visual_size_format='"hu"'
- ;;
---
-2.1.4
-
diff --git a/recipes/libvisual/0005-Fix-compilation-in-win64.patch b/recipes/libvisual/0005-Fix-compilation-in-win64.patch
deleted file mode 100644
index 9f0076dd..00000000
--- a/recipes/libvisual/0005-Fix-compilation-in-win64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c801963c33c8e0af15a00f8a733aa83cf9eca297 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Tue, 6 Mar 2012 23:53:38 +0100
-Subject: [PATCH 05/16] Fix compilation in win64
-
----
- libvisual/lv_cpu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libvisual/lv_cpu.c b/libvisual/lv_cpu.c
-index 867bcf2..fe09752 100644
---- a/libvisual/lv_cpu.c
-+++ b/libvisual/lv_cpu.c
-@@ -115,7 +115,11 @@ static void sigfpe_handler_sse( int signal, struct sigcontext sc )
- LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)
- {
- if(ep->ExceptionRecord->ExceptionCode==EXCEPTION_ILLEGAL_INSTRUCTION){
-+#ifdef _WIN64
-+ ep->ContextRecord->Rip +=3;
-+#else
- ep->ContextRecord->Eip +=3;
-+#endif
- __lv_cpu_caps.hasSSE=0;
- return EXCEPTION_CONTINUE_EXECUTION;
- }
---
-2.1.4
-
diff --git a/recipes/libvisual/0006-Fix-build-in-PPC.patch b/recipes/libvisual/0006-Fix-build-in-PPC.patch
deleted file mode 100644
index 302e5047..00000000
--- a/recipes/libvisual/0006-Fix-build-in-PPC.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 04b4406054ca9ffb5d3edf9206e5cec1529450b9 Mon Sep 17 00:00:00 2001
-From: Josep Torra <n770galaxy@gmail.com>
-Date: Mon, 12 Mar 2012 11:00:42 +0100
-Subject: [PATCH 06/16] Fix build in PPC.
-
----
- libvisual/lv_cpu.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvisual/lv_cpu.c b/libvisual/lv_cpu.c
-index fe09752..b6349a0 100644
---- a/libvisual/lv_cpu.c
-+++ b/libvisual/lv_cpu.c
-@@ -144,7 +144,9 @@ static void sigill_handler (int sig)
- __lv_powerpc_canjump = 0;
- siglongjmp (__lv_powerpc_jmpbuf, 1);
- }
-+#endif
-
-+#if defined(VISUAL_ARCH_POWERPC)
- static void check_os_altivec_support( void )
- {
- #if defined(VISUAL_OS_DARWIN)
---
-2.1.4
-
diff --git a/recipes/libvisual/0007-Fix-build-on-debian-squeeze.patch b/recipes/libvisual/0007-Fix-build-on-debian-squeeze.patch
deleted file mode 100644
index 2a4887a8..00000000
--- a/recipes/libvisual/0007-Fix-build-on-debian-squeeze.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 567baa726cf34d99a27c24ec62c37b94475a195d Mon Sep 17 00:00:00 2001
-From: "Andre Moreira Magalhaes (andrunko)" <andre.magalhaes@collabora.co.uk>
-Date: Mon, 30 Apr 2012 22:43:01 +0100
-Subject: [PATCH 07/16] Fix build on debian squeeze.
-
----
- libvisual/lv_cpu.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libvisual/lv_cpu.c b/libvisual/lv_cpu.c
-index b6349a0..123824a 100644
---- a/libvisual/lv_cpu.c
-+++ b/libvisual/lv_cpu.c
-@@ -76,7 +76,7 @@ static int cpuid (unsigned int ax, unsigned int *p);
-
- /* The sigill handlers */
- #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing)
--#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
-+#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE)
- static void sigill_handler_sse( int signal, struct sigcontext sc )
- {
- /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
-@@ -109,7 +109,7 @@ static void sigfpe_handler_sse( int signal, struct sigcontext sc )
- }
- }
- #endif
--#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE */
-
- #if defined(VISUAL_OS_WIN32)
- LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)
-@@ -149,6 +149,7 @@ static void sigill_handler (int sig)
- #if defined(VISUAL_ARCH_POWERPC)
- static void check_os_altivec_support( void )
- {
-+ return;
- #if defined(VISUAL_OS_DARWIN)
- int sels[2] = {CTL_HW, HW_VECTORUNIT};
- int has_vu = 0;
---
-2.1.4
-
diff --git a/recipes/libvisual/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch b/recipes/libvisual/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch
deleted file mode 100644
index adba57b8..00000000
--- a/recipes/libvisual/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f4e61c5b501a108384506559a9efd7cd982d863f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 22 Aug 2012 16:07:39 +0200
-Subject: [PATCH 08/16] Remove malloc/realloc configure checks, they're broken
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e21483a..9550558 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,8 +139,8 @@ AC_MSG_RESULT($lv_have_gnuc_varargs)
- AC_C_BIGENDIAN(bigendian=yes, bigendian=no, )
-
- # Checks for library functions.
--AC_FUNC_MALLOC
--AC_FUNC_REALLOC
-+# AC_FUNC_MALLOC
-+# AC_FUNC_REALLOC
- AC_FUNC_SELECT_ARGTYPES
- AC_CHECK_FUNCS([gettimeofday usleep nanosleep select memset sqrt strdup strndup sysconf sched_setscheduler])
-
---
-2.1.4
-
diff --git a/recipes/libvisual/0009-Fix-build-for-Android-X86.patch b/recipes/libvisual/0009-Fix-build-for-Android-X86.patch
deleted file mode 100644
index a8f3a885..00000000
--- a/recipes/libvisual/0009-Fix-build-for-Android-X86.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2c6cabc6012de430556d4d1f2be20b2ac064b9f4 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Thu, 3 Jan 2013 14:32:47 +0100
-Subject: [PATCH 09/16] Fix build for Android X86
-
----
- libvisual/lv_cpu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libvisual/lv_cpu.c b/libvisual/lv_cpu.c
-index 123824a..2951dc2 100644
---- a/libvisual/lv_cpu.c
-+++ b/libvisual/lv_cpu.c
-@@ -76,7 +76,7 @@ static int cpuid (unsigned int ax, unsigned int *p);
-
- /* The sigill handlers */
- #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing)
--#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE)
-+#if defined(VISUAL_OS_LINUX) && (defined(_POSIX_SOURCE) || defined(__BIONIC__))
- static void sigill_handler_sse( int signal, struct sigcontext sc )
- {
- /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
---
-2.1.4
-
diff --git a/recipes/libvisual/0010-Only-define-inline-and-friends-if-they-re-not-define.patch b/recipes/libvisual/0010-Only-define-inline-and-friends-if-they-re-not-define.patch
deleted file mode 100644
index 3adfd99a..00000000
--- a/recipes/libvisual/0010-Only-define-inline-and-friends-if-they-re-not-define.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3115b039b3c334f7a7ef97c582c4cf22a65ddd35 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Sat, 2 Mar 2013 19:27:19 +0100
-Subject: [PATCH 10/16] Only #define inline and friends if they're not defined
- yet
-
----
- libvisual/lv_defines.h | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/libvisual/lv_defines.h b/libvisual/lv_defines.h
-index adf10fb..3cd104e 100644
---- a/libvisual/lv_defines.h
-+++ b/libvisual/lv_defines.h
-@@ -63,15 +63,27 @@
-
- /* Compiler specific optimalization macros */
- #if __GNUC__ >= 3
--# define inline inline __attribute__ ((always_inline))
--# define __malloc __attribute__ ((malloc))
--# define __packed __attribute__ ((packed))
-+# ifndef inline
-+# define inline inline __attribute__ ((always_inline))
-+#endif
-+# ifndef __malloc
-+# define __malloc __attribute__ ((malloc))
-+# endif
-+# ifndef __packed
-+# define __packed __attribute__ ((packed))
-+# endif
- # define VIS_LIKELY(x) __builtin_expect (!!(x), 1)
- # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0)
- #else
--# define inline /* no inline */
--# define __malloc /* no malloc */
--# define __packed /* no packed */
-+# ifndef inline
-+# define inline /* no inline */
-+# endif
-+# ifndef __malloc
-+# define __malloc /* no malloc */
-+# endif
-+# ifndef __packed
-+# define __packed /* no packed */
-+# endif
- # define VIS_LIKELY(x) (x)
- # define VIS_UNLIKELY(x) (x)
- #endif
---
-2.1.4
-
diff --git a/recipes/libvisual/0011-Fix-autoreconf-when-using-our-gettext-version.patch b/recipes/libvisual/0011-Fix-autoreconf-when-using-our-gettext-version.patch
deleted file mode 100644
index 4bc82b5b..00000000
--- a/recipes/libvisual/0011-Fix-autoreconf-when-using-our-gettext-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f376afee5ec28b9cc7bfbcd2bc2eb01fda706470 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Fri, 22 Mar 2013 17:04:13 +0100
-Subject: [PATCH 11/16] Fix autoreconf when using our gettext version
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9550558..843ef9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,7 +155,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GETTEXT package name])
- AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale", [String catalog location])
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.14.1])
-+AM_GNU_GETTEXT_VERSION([0.18.2])
-
- dnl -------------------------------
- dnl Check for native thread support
---
-2.1.4
-
diff --git a/recipes/libvisual/0012-configure-gettext-0.18-is-enough-no-0.18.2-needed.patch b/recipes/libvisual/0012-configure-gettext-0.18-is-enough-no-0.18.2-needed.patch
deleted file mode 100644
index d00775c5..00000000
--- a/recipes/libvisual/0012-configure-gettext-0.18-is-enough-no-0.18.2-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6237d4dddc5d9998d025ddf019a09c4bcd4fa217 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Mon, 8 Apr 2013 11:55:55 +0200
-Subject: [PATCH 12/16] configure: gettext 0.18 is enough, no 0.18.2 needed
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 843ef9f..e89815f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,7 +155,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GETTEXT package name])
- AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale", [String catalog location])
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.18.2])
-+AM_GNU_GETTEXT_VERSION([0.18])
-
- dnl -------------------------------
- dnl Check for native thread support
---
-2.1.4
-
diff --git a/recipes/libvisual/0013-Include-lv_cpu.h-for-visual_cpu_initialize.patch b/recipes/libvisual/0013-Include-lv_cpu.h-for-visual_cpu_initialize.patch
deleted file mode 100644
index 38dfb129..00000000
--- a/recipes/libvisual/0013-Include-lv_cpu.h-for-visual_cpu_initialize.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cbb1056dc4ea4f606556e472dc78ddb09dbf3218 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 22 Sep 2014 10:59:08 +0300
-Subject: [PATCH 13/16] Include lv_cpu.h for visual_cpu_initialize()
-
----
- libvisual/lv_libvisual.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libvisual/lv_libvisual.c b/libvisual/lv_libvisual.c
-index 8de03eb..5d77486 100644
---- a/libvisual/lv_libvisual.c
-+++ b/libvisual/lv_libvisual.c
-@@ -39,6 +39,7 @@
- #include "lv_log.h"
- #include "lv_param.h"
- #include "lv_thread.h"
-+#include "lv_cpu.h"
- #include "config.h"
-
-
---
-2.1.4
-
diff --git a/recipes/libvisual/0014-Add-forward-declaration-of-visual_transform_init-as-.patch b/recipes/libvisual/0014-Add-forward-declaration-of-visual_transform_init-as-.patch
deleted file mode 100644
index 56246d2e..00000000
--- a/recipes/libvisual/0014-Add-forward-declaration-of-visual_transform_init-as-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a43b6f7746ab2ef4e4ce5160ebaaccc9c082456e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 22 Sep 2014 11:01:36 +0300
-Subject: [PATCH 14/16] Add forward declaration of visual_transform_init() as
- required
-
----
- libvisual/lv_transform.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvisual/lv_transform.c b/libvisual/lv_transform.c
-index c763768..1ffe03a 100644
---- a/libvisual/lv_transform.c
-+++ b/libvisual/lv_transform.c
-@@ -41,6 +41,8 @@ static int transform_dtor (VisObject *object);
-
- static VisTransformPlugin *get_transform_plugin (VisTransform *transform);
-
-+int visual_transform_init (VisTransform *transform, const char *transformname);
-+
-
- static int transform_dtor (VisObject *object)
- {
---
-2.1.4
-
diff --git a/recipes/libvisual/0015-Include-lv_cpu.h-in-another-place-too.patch b/recipes/libvisual/0015-Include-lv_cpu.h-in-another-place-too.patch
deleted file mode 100644
index 9c7d04ae..00000000
--- a/recipes/libvisual/0015-Include-lv_cpu.h-in-another-place-too.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 29d92e9733db27d2b4143c27c7ff43bba9f67d39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 22 Sep 2014 11:02:06 +0300
-Subject: [PATCH 15/16] Include lv_cpu.h in another place too
-
----
- libvisual/lv_math.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libvisual/lv_math.c b/libvisual/lv_math.c
-index cfae316..da15b74 100644
---- a/libvisual/lv_math.c
-+++ b/libvisual/lv_math.c
-@@ -30,6 +30,7 @@
-
- #include "lv_bits.h"
- #include "lv_math.h"
-+#include "lv_cpu.h"
-
- /* This file is getting big and bloated because of the large chunks of simd code. When all is in place we'll take a serious
- * look how we can reduce this. For example by using macros for common blocks. */
---
-2.1.4
-
diff --git a/recipes/libvisual/0016-configure.ac-Use-gettext-0.19.patch b/recipes/libvisual/0016-configure.ac-Use-gettext-0.19.patch
deleted file mode 100644
index 18d2f1e5..00000000
--- a/recipes/libvisual/0016-configure.ac-Use-gettext-0.19.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cd15f0482252ae3568e106bf15e6bc95aa46fb1c Mon Sep 17 00:00:00 2001
-From: Edward Hervey <bilboed@bilboed.com>
-Date: Fri, 13 Feb 2015 12:49:31 +0100
-Subject: [PATCH 16/16] configure.ac: Use gettext 0.19
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e89815f..f8a1e9d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,7 +155,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GETTEXT package name])
- AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale", [String catalog location])
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.18])
-+AM_GNU_GETTEXT_VERSION([0.19])
-
- dnl -------------------------------
- dnl Check for native thread support
---
-2.1.4
-