From f8bb6740288c6fb94bb79155a8b6e66fd0605706 Mon Sep 17 00:00:00 2001 From: Víctor Manuel Jáquez Leal Date: Wed, 9 Dec 2015 16:59:16 +0100 Subject: libs: make libraries no installables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Víctor Manuel Jáquez Leal --- configure.ac | 12 ------ debian.upstream/Makefile.am | 12 ------ debian.upstream/control.in | 60 -------------------------- debian.upstream/libgstvaapi-dev.install.in | 1 - debian.upstream/libgstvaapi-drm.install.in | 1 - debian.upstream/libgstvaapi-glx.install.in | 1 - debian.upstream/libgstvaapi-wayland.install.in | 1 - debian.upstream/libgstvaapi-x11.install.in | 1 - debian.upstream/libgstvaapi.install.in | 1 - gst-libs/gst/vaapi/Makefile.am | 34 +++------------ tests/Makefile.am | 32 ++++++++++---- 11 files changed, 30 insertions(+), 126 deletions(-) delete mode 100644 debian.upstream/libgstvaapi-dev.install.in delete mode 100644 debian.upstream/libgstvaapi-drm.install.in delete mode 100644 debian.upstream/libgstvaapi-glx.install.in delete mode 100644 debian.upstream/libgstvaapi-wayland.install.in delete mode 100644 debian.upstream/libgstvaapi-x11.install.in delete mode 100644 debian.upstream/libgstvaapi.install.in diff --git a/configure.ac b/configure.ac index 0926c86e..554ff348 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,18 +1074,6 @@ AC_CONFIG_FILES([ debian.upstream/gstreamer-vaapi-doc.install.in debian.upstream/gstreamer$GST_API_VERSION-vaapi.install:\ debian.upstream/gstreamer-vaapi.install.in - debian.upstream/libgstvaapi$GST_PKG_VERSION-dev.install:\ -debian.upstream/libgstvaapi-dev.install.in - debian.upstream/libgstvaapi$GST_VAAPI_MAJOR_VERSION.install:\ -debian.upstream/libgstvaapi.install.in - debian.upstream/libgstvaapi-drm-$GST_VAAPI_MAJOR_VERSION.install:\ -debian.upstream/libgstvaapi-drm.install.in - debian.upstream/libgstvaapi-glx-$GST_VAAPI_MAJOR_VERSION.install:\ -debian.upstream/libgstvaapi-glx.install.in - debian.upstream/libgstvaapi-wayland-$GST_VAAPI_MAJOR_VERSION.install:\ -debian.upstream/libgstvaapi-wayland.install.in - debian.upstream/libgstvaapi-x11-$GST_VAAPI_MAJOR_VERSION.install:\ -debian.upstream/libgstvaapi-x11.install.in docs/Makefile docs/reference/Makefile docs/reference/libs/Makefile diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am index fd5dad5b..ea97d158 100644 --- a/debian.upstream/Makefile.am +++ b/debian.upstream/Makefile.am @@ -12,12 +12,6 @@ DEBIANFILES = \ copyright \ gstreamer-vaapi-doc.install.in \ gstreamer-vaapi.install.in \ - libgstvaapi-dev.install.in \ - libgstvaapi-drm.install.in \ - libgstvaapi-glx.install.in \ - libgstvaapi-wayland.install.in \ - libgstvaapi-x11.install.in \ - libgstvaapi.install.in \ rules \ $(NULL) @@ -26,12 +20,6 @@ DEBIANGENFILES = \ control \ gstreamer$(GST_API_VERSION)-vaapi-doc.install \ gstreamer$(GST_API_VERSION)-vaapi.install \ - libgstvaapi$(GST_PKG_VERSION)-dev.install \ - libgstvaapi$(GST_VAAPI_MAJOR_VERSION).install \ - libgstvaapi-drm-$(GST_VAAPI_MAJOR_VERSION).install \ - libgstvaapi-glx-$(GST_VAAPI_MAJOR_VERSION).install \ - libgstvaapi-wayland-$(GST_VAAPI_MAJOR_VERSION).install \ - libgstvaapi-x11-$(GST_VAAPI_MAJOR_VERSION).install \ $(NULL) EXTRA_DIST = $(DEBIANFILES) diff --git a/debian.upstream/control.in b/debian.upstream/control.in index ec60688f..a66e6c84 100644 --- a/debian.upstream/control.in +++ b/debian.upstream/control.in @@ -45,63 +45,3 @@ Description: VA-API plugins for GStreamer VA-API support plugins for GStreamer. . This package contains the debug files. - -Package: libgstvaapi@GST_VAAPI_MAJOR_VERSION@ -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GStreamer libraries from the "vaapi" set - VA-API support libraries for GStreamer. - . - This package contains common libraries for the "vaapi" set. - -@USE_DRM_TRUE@Package: libgstvaapi-drm-@GST_VAAPI_MAJOR_VERSION@ -@USE_DRM_TRUE@Section: libs -@USE_DRM_TRUE@Architecture: any -@USE_DRM_TRUE@Depends: ${shlibs:Depends}, ${misc:Depends} -@USE_DRM_TRUE@Description: GStreamer libraries from the "vaapi" set -@USE_DRM_TRUE@ VA-API support libraries for GStreamer. -@USE_DRM_TRUE@ . -@USE_DRM_TRUE@ This package contains headless libraries for the "vaapi" set. - -@USE_X11_TRUE@Package: libgstvaapi-x11-@GST_VAAPI_MAJOR_VERSION@ -@USE_X11_TRUE@Section: libs -@USE_X11_TRUE@Architecture: any -@USE_X11_TRUE@Depends: ${shlibs:Depends}, ${misc:Depends} -@USE_X11_TRUE@Description: GStreamer libraries from the "vaapi" set -@USE_X11_TRUE@ VA-API support libraries for GStreamer. -@USE_X11_TRUE@ . -@USE_X11_TRUE@ This package contains x11 libraries for the "vaapi" set. - -@USE_GLX_TRUE@Package: libgstvaapi-glx-@GST_VAAPI_MAJOR_VERSION@ -@USE_GLX_TRUE@Section: libs -@USE_GLX_TRUE@Architecture: any -@USE_GLX_TRUE@Depends: ${shlibs:Depends}, ${misc:Depends} -@USE_GLX_TRUE@Description: GStreamer libraries from the "vaapi" set -@USE_GLX_TRUE@ VA-API support libraries for GStreamer. -@USE_GLX_TRUE@ . -@USE_GLX_TRUE@ This package contains glx libraries for the "vaapi" set. - -@USE_WAYLAND_TRUE@Package: libgstvaapi-wayland-@GST_VAAPI_MAJOR_VERSION@ -@USE_WAYLAND_TRUE@Section: libs -@USE_WAYLAND_TRUE@Architecture: any -@USE_WAYLAND_TRUE@Depends: ${shlibs:Depends}, ${misc:Depends} -@USE_WAYLAND_TRUE@Description: GStreamer libraries from the "vaapi" set -@USE_WAYLAND_TRUE@ VA-API support libraries for GStreamer. -@USE_WAYLAND_TRUE@ . -@USE_WAYLAND_TRUE@ This package contains Wayland libraries for the "vaapi" set. - -Package: libgstvaapi@GST_PKG_VERSION@-dev -Architecture: any -Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, -@USE_DRM_TRUE@ libgstvaapi-drm-@GST_VAAPI_MAJOR_VERSION@ (= ${Source-Version}), -@USE_X11_TRUE@ libgstvaapi-x11-@GST_VAAPI_MAJOR_VERSION@ (= ${Source-Version}), -@USE_GLX_TRUE@ libgstvaapi-glx-@GST_VAAPI_MAJOR_VERSION@ (= ${Source-Version}), -@USE_WAYLAND_TRUE@ libgstvaapi-wayland-@GST_VAAPI_MAJOR_VERSION@ (= ${Source-Version}), - libgstvaapi@GST_VAAPI_MAJOR_VERSION@ (= ${Source-Version}) -Description: GStreamer development files for libraries from the "vaapi" set - GStreamer/VA-API development files. - . - This package contains development files for GStreamer libraries for - the "vaapi" set. diff --git a/debian.upstream/libgstvaapi-dev.install.in b/debian.upstream/libgstvaapi-dev.install.in deleted file mode 100644 index 91ef83bd..00000000 --- a/debian.upstream/libgstvaapi-dev.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi*.so diff --git a/debian.upstream/libgstvaapi-drm.install.in b/debian.upstream/libgstvaapi-drm.install.in deleted file mode 100644 index 3b18b62e..00000000 --- a/debian.upstream/libgstvaapi-drm.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi-drm-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-glx.install.in b/debian.upstream/libgstvaapi-glx.install.in deleted file mode 100644 index c1001021..00000000 --- a/debian.upstream/libgstvaapi-glx.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi-glx-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-wayland.install.in b/debian.upstream/libgstvaapi-wayland.install.in deleted file mode 100644 index ce4b3dd6..00000000 --- a/debian.upstream/libgstvaapi-wayland.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi-wayland-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-x11.install.in b/debian.upstream/libgstvaapi-x11.install.in deleted file mode 100644 index ff05932a..00000000 --- a/debian.upstream/libgstvaapi-x11.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi-x11-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi.install.in b/debian.upstream/libgstvaapi.install.in deleted file mode 100644 index f719a6f3..00000000 --- a/debian.upstream/libgstvaapi.install.in +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libgstvaapi-@GST_API_VERSION@.so.* diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index ec007260..ee10733b 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -1,23 +1,23 @@ -lib_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la +noinst_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la if USE_DRM -lib_LTLIBRARIES += libgstvaapi-drm-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-drm-@GST_API_VERSION@.la endif if USE_X11 -lib_LTLIBRARIES += libgstvaapi-x11-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-x11-@GST_API_VERSION@.la endif if USE_GLX -lib_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la endif if USE_EGL -lib_LTLIBRARIES += libgstvaapi-egl-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-egl-@GST_API_VERSION@.la endif if USE_WAYLAND -lib_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la +noinst_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la endif libgstvaapi_cflags = \ @@ -236,7 +236,6 @@ endif libgstvaapi_drm_source_c = \ gstvaapidisplay_drm.c \ gstvaapiwindow_drm.c \ - gstvaapiutils.c \ $(NULL) libgstvaapi_drm_source_h = \ @@ -247,13 +246,11 @@ libgstvaapi_drm_source_h = \ libgstvaapi_drm_source_priv_h = \ gstvaapicompat.h \ gstvaapidisplay_drm_priv.h \ - gstvaapiutils.h \ $(NULL) libgstvaapi_x11_source_c = \ gstvaapidisplay_x11.c \ gstvaapipixmap_x11.c \ - gstvaapiutils.c \ gstvaapiutils_x11.c \ gstvaapiwindow_x11.c \ $(NULL) @@ -267,7 +264,6 @@ libgstvaapi_x11_source_h = \ libgstvaapi_x11_source_priv_h = \ gstvaapicompat.h \ gstvaapidisplay_x11_priv.h \ - gstvaapiutils.h \ gstvaapiutils_x11.h \ gstvaapiwindow_x11_priv.h \ $(NULL) @@ -275,9 +271,7 @@ libgstvaapi_x11_source_priv_h = \ libgstvaapi_glx_source_c = \ gstvaapidisplay_glx.c \ gstvaapitexture_glx.c \ - gstvaapiutils.c \ gstvaapiutils_glx.c \ - gstvaapiutils_x11.c \ gstvaapiwindow_glx.c \ $(NULL) @@ -293,7 +287,6 @@ libgstvaapi_glx_source_priv_h = \ gstvaapidisplay_glx_priv.h \ gstvaapiutils.h \ gstvaapiutils_glx.h \ - gstvaapiutils_x11.h \ $(NULL) libgstvaapi_egl_source_c = \ @@ -321,7 +314,6 @@ libgstvaapi_egl_source_priv_h = \ libgstvaapi_wayland_source_c = \ gstvaapidisplay_wayland.c \ - gstvaapiutils.c \ gstvaapiwindow_wayland.c \ $(NULL) @@ -333,7 +325,6 @@ libgstvaapi_wayland_source_h = \ libgstvaapi_wayland_source_priv_h = \ gstvaapicompat.h \ gstvaapidisplay_wayland_priv.h \ - gstvaapiutils.h \ $(NULL) libgstvaapi_@GST_API_VERSION@_la_SOURCES = \ @@ -352,8 +343,6 @@ libgstvaapi_@GST_API_VERSION@_la_LIBADD = \ libgstvaapi_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ - -export-symbols-regex "^gst_.*vaapi.*" \ $(NULL) libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES = \ @@ -380,12 +369,10 @@ libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD = \ $(UDEV_LIBS) \ $(DRM_LIBS) \ $(LIBVA_DRM_LIBS) \ - libgstvaapi-$(GST_API_VERSION).la \ $(NULL) libgstvaapi_drm_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES = \ @@ -414,12 +401,10 @@ libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD = \ $(XRANDR_LIBS) \ $(XRENDER_LIBS) \ $(LIBVA_X11_LIBS) \ - libgstvaapi-$(GST_API_VERSION).la \ $(NULL) libgstvaapi_x11_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES = \ @@ -447,14 +432,11 @@ libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD = \ $(X11_LIBS) \ $(GL_LIBS) \ $(LIBVA_X11_LIBS) \ - libgstvaapi-x11-$(GST_API_VERSION).la \ - libgstvaapi-$(GST_API_VERSION).la \ $(DLOPEN_LIBS) \ $(NULL) libgstvaapi_glx_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES = \ @@ -481,14 +463,12 @@ libgstvaapi_egl_@GST_API_VERSION@_la_LIBADD = \ $(GST_LIBS) \ $(GST_BASE_LIBS) \ $(GST_VIDEO_LIBS) \ - libgstvaapi-$(GST_API_VERSION).la \ $(EGL_LIBS) \ $(DLOPEN_LIBS) \ $(NULL) libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \ @@ -514,12 +494,10 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \ $(GST_VIDEO_LIBS) \ $(WAYLAND_LIBS) \ $(LIBVA_WAYLAND_LIBS) \ - libgstvaapi-$(GST_API_VERSION).la \ $(NULL) libgstvaapi_wayland_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ - $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) VERSION_FILE = .VERSION diff --git a/tests/Makefile.am b/tests/Makefile.am index 3637d922..831a9d91 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,49 +29,53 @@ TEST_CFLAGS = \ $(GST_VIDEO_CFLAGS) \ $(NULL) +GST_VAAPI_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la TEST_LIBS = \ $(LIBVA_LIBS) \ $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la + $(NULL) if USE_DRM +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la TEST_CFLAGS += $(LIBVA_DRM_CFLAGS) -TEST_LIBS += \ - $(LIBVA_DRM_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la +TEST_LIBS += $(LIBVA_DRM_LIBS) endif if USE_X11 +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la TEST_CFLAGS += $(X11_CFLAGS) TEST_LIBS += \ $(LIBVA_X11_LIBS) \ $(X11_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la + $(NULL) endif if USE_GLX +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la TEST_CFLAGS += $(X11_CFLAGS) $(GL_CFLAGS) TEST_LIBS += \ $(LIBVA_GLX_LIBS) \ $(X11_LIBS) \ $(GL_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la + $(NULL) endif if USE_EGL +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la TEST_CFLAGS += $(EGL_CFLAGS) TEST_LIBS += \ $(LIBVA_EGL_LIBS) \ $(EGL_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl-$(GST_API_VERSION).la + $(NULL) endif if USE_WAYLAND +GST_VAAPI_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la TEST_CFLAGS += $(WAYLAND_CFLAGS) TEST_LIBS += \ $(LIBVA_WAYLAND_LIBS) \ $(WAYLAND_LIBS) \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la + $(NULL) endif test_utils_dec_source_c = \ @@ -88,10 +92,14 @@ test_utils_source_c = codec.c image.c output.c test_utils_source_h = codec.h image.h output.h noinst_LTLIBRARIES = libutils.la libutils_dec.la + libutils_la_SOURCES = $(test_utils_source_c) libutils_la_CFLAGS = $(TEST_CFLAGS) +libutils_la_LDFLAGS = $(GST_VAAPI_LIBS) + libutils_dec_la_SOURCES = $(test_utils_dec_source_c) libutils_dec_la_CFLAGS = $(TEST_CFLAGS) +libutils_dec_la_LDFLAGS = $(GST_VAAPI_LIBS) test_decode_SOURCES = test-decode.c test_decode_CFLAGS = $(TEST_CFLAGS) @@ -99,39 +107,47 @@ test_decode_LDADD = libutils.la libutils_dec.la $(TEST_LIBS) test_display_SOURCES = test-display.c test_display_CFLAGS = $(TEST_CFLAGS) +test_display_LDFLAGS = $(GST_VAAPI_LIBS) test_display_LDADD = libutils.la $(TEST_LIBS) test_filter_SOURCES = test-filter.c test_filter_CFLAGS = $(TEST_CFLAGS) +test_filter_LDFLAGS = $(GST_VAAPI_LIBS) test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) test_surfaces_SOURCES = test-surfaces.c test_surfaces_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) +test_surfaces_LDFLAGS = $(GST_VAAPI_LIBS) test_surfaces_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) test_subpicture_SOURCES = test-subpicture.c test-subpicture-data.c test_subpicture_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) test_subpicture_LDADD = libutils.la libutils_dec.la $(TEST_LIBS) \ $(GST_VIDEO_LIBS) +test_subpicture_LDFLAGS = $(GST_VAAPI_LIBS) test_windows_SOURCES = test-windows.c test_windows_CFLAGS = $(TEST_CFLAGS) +test_windows_LDFLAGS = $(GST_VAAPI_LIBS) test_windows_LDADD = libutils.la $(TEST_LIBS) test_textures_SOURCES = test-textures.c test_textures_CFLAGS = $(TEST_CFLAGS) +test_textures_LDFLAGS = $(GST_VAAPI_LIBS) test_textures_LDADD = libutils.la $(TEST_LIBS) simple_decoder_source_c = simple-decoder.c simple_decoder_source_h = simple_decoder_SOURCES = $(simple_decoder_source_c) simple_decoder_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) +simple_decoder_LDFLAGS = $(GST_VAAPI_LIBS) simple_decoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) simple_encoder_source_c = simple-encoder.c y4mreader.c simple_encoder_source_h = y4mreader.h simple_encoder_SOURCES = $(simple_encoder_source_c) simple_encoder_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) +simple_encoder_LDFLAGS = $(GST_VAAPI_LIBS) simple_encoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) EXTRA_DIST = \ -- cgit v1.2.3