Accepting request 460301 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/460301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmlt?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2017-03-02 18:30:06 +00:00 committed by Git OBS Bridge
commit 3e3c44ee5d
3 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60 Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Tue, 21 Feb 2017 08:48:14 -0800
Subject: [PATCH] Fix #203 opengl install not using --datadir.
---
src/modules/opengl/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
index ffe542b..65a7b34 100644
--- a/src/modules/opengl/Makefile
+++ b/src/modules/opengl/Makefile
@@ -69,9 +69,9 @@ clean:
rm -f $(OBJS) $(TARGET) $(CPPOBJS)
install: all
- install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
- install -d "$(DESTDIR)$(datadir)/mlt/opengl"
- install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/opengl"
+ install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+ install -d "$(DESTDIR)$(mltdatadir)/opengl"
+ install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/opengl"
ifneq ($(wildcard .depend),)
include .depend

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Feb 21 21:30:37 UTC 2017 - mrueckert@suse.de
- replace mlt-6.4.1_fix_opengl_install.patch with
6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch:
upstream solution to the problem
-------------------------------------------------------------------
Tue Feb 21 14:20:35 UTC 2017 - mrueckert@suse.de
- enable OpenGL and OpenVC modules
new BR:
- OpenGL: movit-devel
- OpenVC: pkgconfig(openvc)
- added mlt-6.4.1_fix_opengl_install.patch: fix install of OpenGL
filter files.
-------------------------------------------------------------------
Wed Nov 16 09:14:15 UTC 2016 - aloisio@gmx.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libmlt
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -44,6 +44,7 @@ Patch1: libmlt-0.8.2-vdpau.patch
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch2: use-recommended-freetype-include.patch
Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: ladspa-devel
@ -60,6 +61,7 @@ BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(QtSvg)
BuildRequires: pkgconfig(QtXml)
%endif
BuildRequires: movit-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(frei0r)
@ -73,6 +75,7 @@ BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libquicktime)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(opencv) >= 3.1.0
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangoft2)
BuildRequires: pkgconfig(samplerate)
@ -229,6 +232,7 @@ This package is needed to use MLT from Python.
%setup -q -n %{_name}-%{version}
%patch1
%patch2 -p1
%patch3 -p1
# To complement libmlt-0.8.0-vdpau.patch.
# When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway.