diff options
author | Scott D Phillips <scott.d.phillips@intel.com> | 2017-02-08 10:17:40 -0800 |
---|---|---|
committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2017-02-09 11:27:44 +0100 |
commit | 3cc4eb7b8138089b8cb64e3ca754784d9c194b59 (patch) | |
tree | ba0a54500c006e174bb53991ef2a936740d14490 /gst-libs/gst | |
parent | a8e482f93f7d78144dbd5aaf919dcfe8d7efb64c (diff) |
make: remove gstvaapiversion.h generation
https://bugzilla.gnome.org/show_bug.cgi?id=778250
Diffstat (limited to 'gst-libs/gst')
-rw-r--r-- | gst-libs/gst/vaapi/Makefile.am | 40 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapidisplay.c | 5 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiversion.h.in | 33 |
3 files changed, 1 insertions, 77 deletions
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index dd3aed59..56a22551 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -143,7 +143,6 @@ libgstvaapi_source_priv_h = \ gstvaapiutils_h264_priv.h \ gstvaapiutils_h265_priv.h \ gstvaapiutils_mpeg2_priv.h \ - gstvaapiversion.h \ gstvaapivideopool_priv.h \ gstvaapiwindow_priv.h \ gstvaapiworkarounds.h \ @@ -507,38 +506,7 @@ libgstvaapi_wayland_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(NULL) -VERSION_FILE = .VERSION -OLD_VERSION_FILE = $(VERSION_FILE).old -NEW_VERSION_FILE = $(VERSION_FILE).new -PKG_VERSION_FILE = $(VERSION_FILE).pkg - -gstvaapiversion.h: gen-version - $(AM_V_GEN) \ - OV=`[ -f $(OLD_VERSION_FILE) ] && cat $(OLD_VERSION_FILE) || :`; \ - NV=`cat $(NEW_VERSION_FILE)`; \ - if [ "$$OV" != "$$NV" -o ! -f gstvaapiversion.h ]; then \ - cp -f $(NEW_VERSION_FILE) $(OLD_VERSION_FILE); \ - $(SED) -e "s|\@GST_VAAPI_VERSION_ID\@|$${NV}|" \ - $(srcdir)/gstvaapiversion.h.in > gstvaapiversion.h; \ - fi - -gen-version: - @echo $(VERSION) > $(NEW_VERSION_FILE) -if HAVE_GIT - @[ -d $(top_srcdir)/.git ] && \ - (cd $(top_srcdir) && $(GIT) describe --tags) > $(NEW_VERSION_FILE) || : -endif - @[ -f $(srcdir)/$(PKG_VERSION_FILE) ] && \ - cp -f $(srcdir)/$(PKG_VERSION_FILE) $(NEW_VERSION_FILE) || : - -$(PKG_VERSION_FILE): $(NEW_VERSION_FILE) - @cp -f $< $@ - -BUILT_SOURCES = gstvaapiversion.h -EXTRA_DIST = gstvaapiversion.h.in $(PKG_VERSION_FILE) -DISTCLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST += \ +EXTRA_DIST = \ $(libgstvaapi_enc_source_c) \ $(libgstvaapi_enc_source_h) \ $(libgstvaapi_enc_source_priv_h) \ @@ -564,10 +532,4 @@ EXTRA_DIST += \ $(libgstvaapi_egl_source_priv_h) \ $(NULL) -CLEANFILES = \ - $(OLD_VERSION_FILE) \ - $(NEW_VERSION_FILE) \ - $(PKG_VERSION_FILE) \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c index e47058d7..61bc8d76 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay.c @@ -35,7 +35,6 @@ #include "gstvaapitexturemap.h" #include "gstvaapidisplay_priv.h" #include "gstvaapiworkarounds.h" -#include "gstvaapiversion.h" /* Debug category for all vaapi libs */ GST_DEBUG_CATEGORY (gst_debug_vaapi); @@ -126,10 +125,6 @@ libgstvaapi_init_once (void) GST_DEBUG_CATEGORY_INIT (gst_debug_vaapi, "vaapi", 0, "VA-API helper"); - /* Dump gstreamer-vaapi version for debugging purposes */ - GST_CAT_INFO (gst_debug_vaapi, "gstreamer-vaapi version %s", - GST_VAAPI_VERSION_ID); - gst_vaapi_display_properties_init (); g_once_init_leave (&g_once, TRUE); diff --git a/gst-libs/gst/vaapi/gstvaapiversion.h.in b/gst-libs/gst/vaapi/gstvaapiversion.h.in deleted file mode 100644 index e4896a4f..00000000 --- a/gst-libs/gst/vaapi/gstvaapiversion.h.in +++ /dev/null @@ -1,33 +0,0 @@ -/* - * gstvaapiversion.h - Versioning - * - * Copyright (C) 2013 Intel Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#ifndef GST_VAAPI_VERSION_H -#define GST_VAAPI_VERSION_H - -/** - * GST_VAAPI_VERSION_ID: - * - * The full version identifier of gstreamer-vaapi, in string form - * (suitable for string concatenation). - */ -#define GST_VAAPI_VERSION_ID "@GST_VAAPI_VERSION_ID@" - -#endif /* GST_VAAPI_VERSION_H */ |