From 1ceef7d5b992585c8fee82d76336e3bff321ead5 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Sat, 19 Apr 2014 07:49:30 +0200 Subject: [PATCH] vp8: fix compilation with built-in libvpx. Apply correct patch from fd.o #722760 to fix several issues: update the license terms to LGPLv2.1+, fix dependencies to built-in libvpx and fix make dist. --- Makefile.am | 2 +- debian.upstream/libgstvaapi.install.in | 1 + ext/libvpx/Makefile.am | 43 +++++++++++++------------- ext/libvpx/sources.frag | 33 ++++++++------------ gst-libs/gst/codecparsers/Makefile.am | 1 + 5 files changed, 38 insertions(+), 42 deletions(-) diff --git a/Makefile.am b/Makefile.am index 70cb5eea90..1d08eba0e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AUTOMAKE_OPTIONS = foreign -SUBDIRS = debian.upstream gst-libs gst pkgconfig tests docs ext +SUBDIRS = debian.upstream ext gst-libs gst pkgconfig tests docs # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = \ diff --git a/debian.upstream/libgstvaapi.install.in b/debian.upstream/libgstvaapi.install.in index f719a6f347..afb5221421 100644 --- a/debian.upstream/libgstvaapi.install.in +++ b/debian.upstream/libgstvaapi.install.in @@ -1 +1,2 @@ +debian/tmp/usr/lib/libgstcodecparsers_vpx.so.* debian/tmp/usr/lib/libgstvaapi-@GST_API_VERSION@.so.* diff --git a/ext/libvpx/Makefile.am b/ext/libvpx/Makefile.am index 9211a2117e..4f54b93c15 100644 --- a/ext/libvpx/Makefile.am +++ b/ext/libvpx/Makefile.am @@ -1,29 +1,22 @@ # Makefile.am - Rules for the built-in libvpx sources # -# INTEL CONFIDENTIAL, FOR INTERNAL USE ONLY # Copyright (C) 2014 Intel Corporation # Author: Gwenole Beauchesne # -# @BEGIN_LICENSE@ -# The source code contained or described herein and all documents -# related to the source code ("Material") are owned by Intel -# Corporation or its suppliers or licensors. Title to the Material -# remains with Intel Corporation or its suppliers and licensors. The -# Material contains trade secrets and proprietary and confidential -# information of Intel or its suppliers and licensors. The Material -# is protected by worldwide copyright and trade secret laws and -# treaty provisions. No part of the Material may be used, copied, -# reproduced, modified, published, uploaded, posted, transmitted, -# distributed, or disclosed in any way without Intel’s prior express -# written permission. +# 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. # -# No license under any patent, copyright, trade secret or other -# intellectual property right is granted to or conferred upon you by -# disclosure or delivery of the Materials, either expressly, by -# implication, inducement, estoppel or otherwise. Any license under -# such intellectual property rights must be express and approved by -# Intel in writing. -# @END_LICENSE@ +# 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. lib_LTLIBRARIES = if USE_LOCAL_CODEC_PARSERS_VP8 @@ -102,6 +95,8 @@ vpx.configure.stamp: cd .. && \ touch $@ +$(gst_vpx_source_c): vpx.build + CLEANFILES = vpx.build.stamp # Files for packaging @@ -127,7 +122,6 @@ vpx_sources = \ $(vpx_source_mak:%.mk=$(vpx_srcdir)/%.mk) \ $(vpx_source_c:%.c=$(vpx_srcdir)/%.c) \ $(vpx_source_h:%.h=$(vpx_srcdir)/%.h) \ - $(vpx_source_asm:%.asm=$(vpx_srcdir)/%.asm) \ $(NULL) EXTRA_DIST = \ @@ -137,5 +131,12 @@ EXTRA_DIST = \ $(vpx_versions) \ $(NULL) +# Avoid implicit rule that tries to compile .asm.o to .asm +dist-hook: + for f in $(vpx_source_asm); do \ + mkdir -p $(distdir)/$(vpx_upstream)/$$(dirname $$f); \ + cp -fpR $(vpx_srcdir)/$$f $(distdir)/$(vpx_upstream)/$$f; \ + done + # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = Makefile.in vpx.configure.stamp diff --git a/ext/libvpx/sources.frag b/ext/libvpx/sources.frag index d96f6d286f..02eb45d381 100644 --- a/ext/libvpx/sources.frag +++ b/ext/libvpx/sources.frag @@ -1,29 +1,22 @@ # sources.frag - Generated list of source files for libvpx (-*- makefile -*-) # -# INTEL CONFIDENTIAL, FOR INTERNAL USE ONLY # Copyright (C) 2014 Intel Corporation # Author: Gwenole Beauchesne # -# @BEGIN_LICENSE@ -# The source code contained or described herein and all documents -# related to the source code ("Material") are owned by Intel -# Corporation or its suppliers or licensors. Title to the Material -# remains with Intel Corporation or its suppliers and licensors. The -# Material contains trade secrets and proprietary and confidential -# information of Intel or its suppliers and licensors. The Material -# is protected by worldwide copyright and trade secret laws and -# treaty provisions. No part of the Material may be used, copied, -# reproduced, modified, published, uploaded, posted, transmitted, -# distributed, or disclosed in any way without Intel’s prior express -# written permission. +# 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. # -# No license under any patent, copyright, trade secret or other -# intellectual property right is granted to or conferred upon you by -# disclosure or delivery of the Materials, either expressly, by -# implication, inducement, estoppel or otherwise. Any license under -# such intellectual property rights must be express and approved by -# Intel in writing. -# @END_LICENSE@ +# 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. vpx_source_mak = \ docs.mk \ diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index ece46eff50..d7c9dd8305 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -96,6 +96,7 @@ $(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la: EXTRA_DIST = \ $(add_source_c) \ + $(add_source_h) \ $(NULL) DISTCLEANFILES = $(GENFILES) .timestamp.symlinks