Accepting request 612942 from home:iznogood:branches:multimedia:libs
- Add vid_stab-fix-license.patch: Fix conflicting licenses, patch merged upstream. OBS-URL: https://build.opensuse.org/request/show/612942 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vid_stab?expand=0&rev=5
This commit is contained in:
parent
0bab2c42dc
commit
0fdb030bea
57
vid_stab-fix-license.patch
Normal file
57
vid_stab-fix-license.patch
Normal file
@ -0,0 +1,57 @@
|
||||
From cf6a1a2297130ec8182fa81dda6acb97ab8c7932 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
|
||||
Date: Tue, 29 May 2018 17:37:47 +0200
|
||||
Subject: [PATCH 1/2] Update transformfixedpoint.h
|
||||
|
||||
Drop conflicting Attribution-NonCommercial-ShareAlike 2.5 License.
|
||||
---
|
||||
src/transformfixedpoint.h | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/src/transformfixedpoint.h b/src/transformfixedpoint.h
|
||||
index 519d613..e96011d 100644
|
||||
--- a/src/transformfixedpoint.h
|
||||
+++ b/src/transformfixedpoint.h
|
||||
@@ -20,13 +20,6 @@
|
||||
* along with GNU Make; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
- * This work is licensed under the Creative Commons
|
||||
- * Attribution-NonCommercial-ShareAlike 2.5 License. To view a copy of
|
||||
- * this license, visit http://creativecommons.org/licenses/by-nc-sa/2.5/
|
||||
- * or send a letter to Creative Commons, 543 Howard Street, 5th Floor,
|
||||
- * San Francisco, California, 94105, USA.
|
||||
- * This EXCLUDES COMMERCIAL USAGE
|
||||
- *
|
||||
*/
|
||||
#ifndef __TRANSFORMFIXEDPOINT_H
|
||||
#define __TRANSFORMFIXEDPOINT_H
|
||||
|
||||
From bc1ac0a378c15f3f14799a8bffee305daa6e0354 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
|
||||
Date: Tue, 29 May 2018 17:40:27 +0200
|
||||
Subject: [PATCH 2/2] Update transformfloat.h
|
||||
|
||||
Drop conflicting Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License
|
||||
---
|
||||
src/transformfloat.h | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/src/transformfloat.h b/src/transformfloat.h
|
||||
index 9799417..ed9428b 100644
|
||||
--- a/src/transformfloat.h
|
||||
+++ b/src/transformfloat.h
|
||||
@@ -20,12 +20,6 @@
|
||||
* along with GNU Make; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
- * This work is licensed under the Creative Commons
|
||||
- * Attribution-NonCommercial-ShareAlike 2.5 License. To view a copy of
|
||||
- * this license, visit http://creativecommons.org/licenses/by-nc-sa/2.5/
|
||||
- * or send a letter to Creative Commons, 543 Howard Street, 5th Floor,
|
||||
- * San Francisco, California, 94105, USA.
|
||||
- * This EXCLUDES COMMERCIAL USAGE
|
||||
*
|
||||
*/
|
||||
#ifndef __TRANSFORMFLOAT_H
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 29 21:35:06 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Add vid_stab-fix-license.patch: Fix conflicting licenses, patch
|
||||
merged upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 6 18:29:22 UTC 2018 - olaf@aepfle.de
|
||||
|
||||
|
@ -26,6 +26,7 @@ License: GPL-2.0+
|
||||
Group: Development/Libraries/C and C++
|
||||
Url: http://public.hronopik.de/vid.stab/
|
||||
Source0: https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz
|
||||
Patch0: vid_stab-fix-license.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
@ -50,6 +51,7 @@ Development files for libvidstab%{soname}.
|
||||
|
||||
%prep
|
||||
%setup -q -n vid.stab-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake
|
||||
|
Loading…
Reference in New Issue
Block a user