allocatorsbad: physmem moved to -base

11 files changed, 6 insertions, 294 deletions

diff --git a/configure.ac b/configure.ac
index 0fd0110f0..89b39b3c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2669,7 +2669,6 @@ gst-libs/gst/player/Makefile
 gst-libs/gst/video/Makefile
 gst-libs/gst/audio/Makefile
 gst-libs/gst/opencv/Makefile
-gst-libs/gst/allocators/Makefile
 sys/Makefile
 sys/dshowdecwrapper/Makefile
 sys/acmenc/Makefile
@@ -2807,8 +2806,6 @@ pkgconfig/gstreamer-bad-video.pc
 pkgconfig/gstreamer-bad-video-uninstalled.pc
 pkgconfig/gstreamer-bad-audio.pc
 pkgconfig/gstreamer-bad-audio-uninstalled.pc
-pkgconfig/gstreamer-bad-allocators.pc
-pkgconfig/gstreamer-bad-allocators-uninstalled.pc
 tools/Makefile
 m4/Makefile
 )
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 62dd9fdfa..ae541aaf8 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -7,18 +7,18 @@ OPENCV_DIR=opencv
 endif
 
 SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc codecparsers \
-	 insertbin mpegts video audio player allocators isoff $(WAYLAND_DIR) \
+	 insertbin mpegts video audio player isoff $(WAYLAND_DIR) \
 	 $(OPENCV_DIR)
 
 noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
 DIST_SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc \
-	codecparsers insertbin mpegts wayland opencv video audio player allocators isoff
+	codecparsers insertbin mpegts wayland opencv video audio player isoff
 
 adaptivedemux: uridownloader
 
 INDEPENDENT_SUBDIRS = \
 	interfaces basecamerabinsrc codecparsers insertbin uridownloader \
-	mpegts player allocators isoff $(WAYLAND_DIR) $(OPENCV_DIR)
+	mpegts player isoff $(WAYLAND_DIR) $(OPENCV_DIR)
 
 .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)
 
diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
deleted file mode 100644
index e50d077ca..000000000
--- a/gst-libs/gst/allocators/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-lib_LTLIBRARIES = libgstbadallocators-@GST_API_VERSION@.la
-
-libgstbadallocators_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/allocators
-
-libgstbadallocators_@GST_API_VERSION@_include_HEADERS = \
-	badallocators.h \
-	gstphysmemory.h
-
-noinst_HEADERS =
-
-libgstbadallocators_@GST_API_VERSION@_la_SOURCES = \
-	gstphysmemory.c
-
-libgstbadallocators_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(LIBM)
-libgstbadallocators_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstbadallocators_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
-
-if HAVE_INTROSPECTION
-BUILT_GIRSOURCES = GstBadAllocators-@GST_API_VERSION@.gir
-
-gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbadallocators_@GST_API_VERSION@_include_HEADERS))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbadallocators_@GST_API_VERSION@_la_SOURCES))
-gir_cincludes=$(patsubst %,--c-include='gst/badallocators/%',$(libgstbadallocators_@GST_API_VERSION@_include_HEADERS))
-
-GstBadAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbadallocators-@GST_API_VERSION@.la
-	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
-		GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
-		CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
-		$(INTROSPECTION_SCANNER) -v --namespace GstBadAllocators \
-		--nsversion=@GST_API_VERSION@ \
-		--identifier-prefix=Gst \
-		--symbol-prefix=gst \
-		--warn-all \
-		--c-include "gst/allocators/badallocators.h" \
-		-I$(top_srcdir)/gst-libs \
-		-I$(top_builddir)/gst-libs \
-		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-		--library=libgstbadallocators-@GST_API_VERSION@.la \
-		--include=Gst-@GST_API_VERSION@ \
-		--libtool="$(top_builddir)/libtool" \
-		--pkg gstreamer-@GST_API_VERSION@ \
-		--pkg-export gstreamer-badallocators-@GST_API_VERSION@ \
-		--output $@ \
-		$(gir_headers) \
-		$(gir_sources)
-
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0/
-
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
-		$(INTROSPECTION_COMPILER) \
-		--includedir=$(srcdir) \
-		--includedir=$(builddir) \
-		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
-
-CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
-endif
diff --git a/gst-libs/gst/allocators/badallocators.h b/gst-libs/gst/allocators/badallocators.h
deleted file mode 100644
index 4e182157d..000000000
--- a/gst-libs/gst/allocators/badallocators.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 GStreamer developers
- *
- * allocatorsbad.h: single include header for gst-allocators-bad library
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_ALLOCATORS_BAD_H__
-#define __GST_ALLOCATORS_BAD_H__
-
-#include <gst/allocators/gstphysmemory.h>
-
-#endif /* __GST_ALLOCATORS_BAD_H__ */
-
diff --git a/gst-libs/gst/allocators/gstphysmemory.c b/gst-libs/gst/allocators/gstphysmemory.c
deleted file mode 100644
index da1dc5f68..000000000
--- a/gst-libs/gst/allocators/gstphysmemory.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 Sebastian Dröge <sebastian@centricular.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstphysmemory.h"
-
-G_DEFINE_INTERFACE (GstPhysMemoryAllocator, gst_phys_memory_allocator,
-    GST_TYPE_ALLOCATOR);
-
-static void
-gst_phys_memory_allocator_default_init (GstPhysMemoryAllocatorInterface * iface)
-{
-}
-
-/**
- * gst_is_phys_memory:
- * @mem: a #GstMemory
- *
- * Returns: whether the memory at @mem is backed by physical memory
- *
- * Since: 1.12
- */
-gboolean
-gst_is_phys_memory (GstMemory * mem)
-{
-  return mem != NULL && mem->allocator != NULL
-      && g_type_is_a (G_OBJECT_TYPE (mem->allocator),
-      GST_TYPE_PHYS_MEMORY_ALLOCATOR);
-}
-
-/**
- * gst_phys_memory_get_phys_addr:
- * @mem: a #GstMemory
- *
- * Returns: Physical memory address that is backing @mem, or 0 if none
- *
- * Since: 1.12
- */
-guintptr
-gst_phys_memory_get_phys_addr (GstMemory * mem)
-{
-  GstPhysMemoryAllocatorInterface *iface;
-
-  g_return_val_if_fail (gst_is_phys_memory (mem), 0);
-
-  iface = GST_PHYS_MEMORY_ALLOCATOR_GET_INTERFACE (mem->allocator);
-  g_return_val_if_fail (iface->get_phys_addr != NULL, 0);
-
-  return iface->get_phys_addr ((GstPhysMemoryAllocator *) mem->allocator, mem);
-}
diff --git a/gst-libs/gst/allocators/gstphysmemory.h b/gst-libs/gst/allocators/gstphysmemory.h
deleted file mode 100644
index e8cc9f4ac..000000000
--- a/gst-libs/gst/allocators/gstphysmemory.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 Sebastian Dröge <sebastian@centricular.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PHYS_MEMORY_H__
-#define __GST_PHYS_MEMORY_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstPhysMemoryAllocator GstPhysMemoryAllocator;
-typedef struct _GstPhysMemoryAllocatorInterface GstPhysMemoryAllocatorInterface;
-
-#define GST_TYPE_PHYS_MEMORY_ALLOCATOR                  (gst_phys_memory_allocator_get_type())
-#define GST_IS_PHYS_MEMORY_ALLOCATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PHYS_MEMORY_ALLOCATOR))
-#define GST_IS_PHYS_MEMORY_ALLOCATOR_INTERFACE(iface)   (G_TYPE_CHECK_INTERFACE_TYPE ((iface), GST_TYPE_PHYS_MEMORY_ALLOCATOR))
-#define GST_PHYS_MEMORY_ALLOCATOR_GET_INTERFACE(obj)    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_PHYS_MEMORY_ALLOCATOR, GstPhysMemoryAllocatorInterface))
-#define GST_PHYS_MEMORY_ALLOCATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PHYS_MEMORY_ALLOCATOR, GstPhysMemoryAllocator))
-#define GST_PHYS_MEMORY_ALLOCATOR_INTERFACE(iface)      (G_TYPE_CHECK_INTERFACE_CAST ((iface), GST_TYPE_PHYS_MEMORY_ALLOCATOR, GstPhysMemoryAllocatorInterface))
-#define GST_PHYS_MEMORY_ALLOCATOR_CAST(obj)             ((GstPhysMemoryAllocator *)(obj))
-
-/**
- * GstPhysMemoryAllocatorInterface:
- *
- * Marker interface for allocators with physical address backed memory
- *
- * Since: 1.12
- */
-struct _GstPhysMemoryAllocatorInterface
-{
-  GTypeInterface parent_iface;
-
-  guintptr (*get_phys_addr) (GstPhysMemoryAllocator * allocator, GstMemory * mem);
-};
-
-GST_EXPORT
-GType gst_phys_memory_allocator_get_type (void);
-
-GST_EXPORT
-gboolean gst_is_phys_memory (GstMemory *mem);
-
-GST_EXPORT
-guintptr gst_phys_memory_get_phys_addr (GstMemory * mem);
-
-G_END_DECLS
-
-#endif /* __GST_PHYS_MEMORY_H__ */
diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
deleted file mode 100644
index 447bc80f8..000000000
--- a/gst-libs/gst/allocators/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-badallocators_sources = [
-  'gstphysmemory.c',
-]
-
-badallocators_headers = [
-  'badallocators.h',
-  'gstphysmemory.h',
-]
-
-install_headers(badallocators_headers, subdir : 'gstreamer-1.0/gst/allocators')
-
-gstbadallocators = library('gstbadallocators-' + api_version,
-  badallocators_sources,
-  c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
-  include_directories : [configinc, libsinc],
-  version : libversion,
-  soversion : soversion,
-  install : true,
-  dependencies : [gst_dep]
-)
-
-gstbadallocators_dep = declare_dependency(link_with : gstbadallocators,
-  include_directories : [libsinc],
-  dependencies : [gst_dep])
diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build
index 32b812667..aac5398af 100644
--- a/gst-libs/gst/meson.build
+++ b/gst-libs/gst/meson.build
@@ -1,6 +1,5 @@
 subdir('uridownloader')
 
-subdir('allocators')
 subdir('adaptivedemux')
 subdir('audio')
 subdir('basecamerabinsrc')
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index b5f1d7bb1..6598baf14 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -7,8 +7,7 @@ pcverfiles =  \
 	gstreamer-mpegts-@GST_API_VERSION@.pc \
 	gstreamer-player-@GST_API_VERSION@.pc \
 	gstreamer-bad-audio-@GST_API_VERSION@.pc \
-	gstreamer-bad-video-@GST_API_VERSION@.pc \
-	gstreamer-bad-allocators-@GST_API_VERSION@.pc
+	gstreamer-bad-video-@GST_API_VERSION@.pc
 
 pcverfiles_uninstalled = \
 	gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \
@@ -17,8 +16,7 @@ pcverfiles_uninstalled = \
 	gstreamer-mpegts-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-player-@GST_API_VERSION@-uninstalled.pc \
 	gstreamer-bad-audio-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-bad-allocators-@GST_API_VERSION@-uninstalled.pc
+	gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcverfiles) $(pcverfiles_uninstalled)
 
@@ -56,8 +54,7 @@ pcinfiles = \
            gstreamer-mpegts.pc.in gstreamer-mpegts-uninstalled.pc.in \
            gstreamer-player.pc.in gstreamer-player-uninstalled.pc.in \
            gstreamer-bad-audio.pc.in gstreamer-bad-audio-uninstalled.pc.in \
-           gstreamer-bad-video.pc.in gstreamer-bad-video-uninstalled.pc.in \
-           gstreamer-bad-allocators.pc.in gstreamer-bad-allocators-uninstalled.pc.in
+           gstreamer-bad-video.pc.in gstreamer-bad-video-uninstalled.pc.in
 
 DISTCLEANFILES = $(pcinfiles:.in=)
 EXTRA_DIST = $(pcinfiles)
diff --git a/pkgconfig/gstreamer-bad-allocators-uninstalled.pc.in b/pkgconfig/gstreamer-bad-allocators-uninstalled.pc.in
deleted file mode 100644
index 6747eb2b8..000000000
--- a/pkgconfig/gstreamer-bad-allocators-uninstalled.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# the standard variables don't make sense for an uninstalled copy
-prefix=
-exec_prefix=
-libdir=@abs_top_builddir@/gst-libs/gst/allocators/.libs
-# includedir is builddir because it is used to find gstconfig.h in places
-includedir=@abs_top_builddir@/gst-libs
-girdir=@abs_top_builddir@/gst-libs/gst/allocators
-typelibdir=@abs_top_builddir@/gst-libs/gst/allocators
-
-Name: GStreamer Bad Allocators Library, Uninstalled
-Description: Bad Allocators implementation, uninstalled
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@
-Libs: -L${libdir} -lgstbadallocators-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
-
diff --git a/pkgconfig/gstreamer-bad-allocators.pc.in b/pkgconfig/gstreamer-bad-allocators.pc.in
deleted file mode 100644
index 593b3e2a3..000000000
--- a/pkgconfig/gstreamer-bad-allocators.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-girdir=${datadir}/gir-1.0
-typelibdir=${libdir}/girepository-1.0
-
-Name: GStreamer Bad Allocators Library
-Description: Bad Allocators implementation
-Requires: gstreamer-@GST_API_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lgstbadallocators-@GST_API_VERSION@
-Cflags: -I${includedir}
-