peter pushed to libyuv (epel7). "resolve header conflict with duplicate definition in scale*.h"

[notifications at fedoraproject.org]

>From c2051f62c2402e415dd64ddebe567bab0096e291 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 14 Jun 2012 13:54:13 -0400
Subject: resolve header conflict with duplicate definition in scale*.h


diff --git a/libyuv-0-resolve-scale-header-conflict.patch b/libyuv-0-resolve-scale-header-conflict.patch
new file mode 100644
index 0000000..a3f127c
--- /dev/null
+++ b/libyuv-0-resolve-scale-header-conflict.patch
@@ -0,0 +1,96 @@
+diff -up libyuv-0/include/libyuv/scale_argb.h.common libyuv-0/include/libyuv/scale_argb.h
+--- libyuv-0/include/libyuv/scale_argb.h.common	2012-06-14 13:36:41.310252842 -0400
++++ libyuv-0/include/libyuv/scale_argb.h	2012-06-14 13:36:55.571253054 -0400
+@@ -12,19 +12,13 @@
+ #define INCLUDE_LIBYUV_SCALE_ARGB_H_
+ 
+ #include "libyuv/basic_types.h"
++#include "libyuv/scale_common.h"
+ 
+ #ifdef __cplusplus
+ namespace libyuv {
+ extern "C" {
+ #endif
+ 
+-// Supported filtering
+-enum FilterMode {
+-  kFilterNone = 0,  // Point sample; Fastest
+-  kFilterBilinear = 1,  // Faster than box, but lower quality scaling down.
+-  kFilterBox = 2  // Highest quality (not supported for ARGB)
+-};
+-
+ int ARGBScale(const uint8* src_argb, int src_stride_argb,
+               int src_width, int src_height,
+               uint8* dst_argb, int dst_stride_argb,
+diff -up libyuv-0/include/libyuv/scale_common.h.common libyuv-0/include/libyuv/scale_common.h
+--- libyuv-0/include/libyuv/scale_common.h.common	2012-06-14 13:37:34.698253642 -0400
++++ libyuv-0/include/libyuv/scale_common.h	2012-06-14 13:37:18.417253398 -0400
+@@ -0,0 +1,33 @@
++/*
++ *  Copyright (c) 2011 The LibYuv project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
++#ifndef INCLUDE_LIBYUV_SCALE_COMMON_H_
++#define INCLUDE_LIBYUV_SCALE_COMMON_H_
++
++#include "libyuv/basic_types.h"
++
++#ifdef __cplusplus
++namespace libyuv {
++extern "C" {
++#endif
++
++// Supported filtering
++enum FilterMode {
++  kFilterNone = 0,  // Point sample; Fastest
++  kFilterBilinear = 1,  // Faster than box, but lower quality scaling down.
++  kFilterBox = 2  // Highest quality (not supported for ARGB)
++};
++
++#ifdef __cplusplus
++}  // extern "C"
++}  // namespace libyuv
++#endif
++
++#endif  // INCLUDE_LIBYUV_SCALE_COMMON_H_
+diff -up libyuv-0/include/libyuv/scale.h.common libyuv-0/include/libyuv/scale.h
+--- libyuv-0/include/libyuv/scale.h.common	2012-06-14 13:35:30.474251778 -0400
++++ libyuv-0/include/libyuv/scale.h	2012-06-14 13:37:27.991253541 -0400
+@@ -12,19 +12,13 @@
+ #define INCLUDE_LIBYUV_SCALE_H_
+ 
+ #include "libyuv/basic_types.h"
++#include "libyuv/scale_common.h"
+ 
+ #ifdef __cplusplus
+ namespace libyuv {
+ extern "C" {
+ #endif
+ 
+-// Supported filtering
+-enum FilterMode {
+-  kFilterNone = 0,  // Point sample; Fastest
+-  kFilterBilinear = 1,  // Faster than box, but lower quality scaling down.
+-  kFilterBox = 2  // Highest quality
+-};
+-
+ // Scale a YUV plane.
+ void ScalePlane(const uint8* src, int src_stride,
+                 int src_width, int src_height,
+diff -up libyuv-0/source/Makefile.am.common libyuv-0/source/Makefile.am
+--- libyuv-0/source/Makefile.am.common	2012-06-14 13:37:54.170253935 -0400
++++ libyuv-0/source/Makefile.am	2012-06-14 13:38:26.851254425 -0400
+@@ -34,6 +34,7 @@ libyuvnobase_include_HEADERS = ../includ
+ 			       ../include/libyuv/rotate.h \
+ 			       ../include/libyuv/scale.h \
+ 			       ../include/libyuv/scale_argb.h \
++			       ../include/libyuv/scale_common.h \
+ 			       ../include/libyuv/version.h \
+ 			       ../include/libyuv/video_common.h \
+ 			       $(mjpeg_HDRS)
diff --git a/libyuv.spec b/libyuv.spec
index fb5d5b0..b1e2dfa 100644
--- a/libyuv.spec
+++ b/libyuv.spec
@@ -1,7 +1,7 @@
 Name:		libyuv
 Summary:	YUV conversion and scaling functionality library
 Version:	0
-Release:	0.8.20120518svn268%{?dist}
+Release:	0.9.20120518svn268%{?dist}
 License:	BSD
 Group:		Development/Libraries
 Url:		http://code.google.com/p/libyuv/
@@ -12,6 +12,8 @@ Source0:	%{name}-%{version}.tar.bz2
 Patch1:		libyuv-0001-Initial-autotools-support.patch
 # Fedora-specific.
 Patch2:		libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch
+# Resolve header conflict with duplicate definition in two header files
+Patch3:		libyuv-0-resolve-scale-header-conflict.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -43,6 +45,7 @@ Additional header files for development with %{name}.
 %setup -q
 %patch1 -p1 -b .autotools
 %patch2 -p1 -b .fix_paths
+%patch3 -p1 -b .common
 
 
 %build
@@ -84,6 +87,9 @@ make check
 
 
 %changelog
+* Thu Jun 14 2012 Tom Callaway <spot at fedoraproject.org> - 0-0.9.20120518svn268
+- resolve header conflict with duplicate definition in scale*.h
+
 * Fri May 18 2012 Peter Lemenkov <lemenkov at gmail.com> - 0-0.8.20120518svn268
 - Next svn snapshot - ver. 268
 - Fixed failure on s390x and PPC64 (see rhbz #822494)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libyuv.git/commit/?h=epel7&id=c2051f62c2402e415dd64ddebe567bab0096e291