From ea6ca1fda06f6a061e0d107628418d948a4c3667 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 24 Apr 2019 09:00:37 +0100 Subject: [PATCH] update to 1.22.4 --- ...cogl-fixed.h-Use-static-inline-inste.patch | 179 ------------------ cogl.spec | 23 +-- sources | 2 +- 3 files changed, 7 insertions(+), 197 deletions(-) delete mode 100644 0001-cogl-deprecated-cogl-fixed.h-Use-static-inline-inste.patch diff --git a/0001-cogl-deprecated-cogl-fixed.h-Use-static-inline-inste.patch b/0001-cogl-deprecated-cogl-fixed.h-Use-static-inline-inste.patch deleted file mode 100644 index 3cf01c5..0000000 --- a/0001-cogl-deprecated-cogl-fixed.h-Use-static-inline-inste.patch +++ /dev/null @@ -1,179 +0,0 @@ -From ca9db0bfdb9b78e48e2fd078c6c5aa86bea102b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javier=20Jard=C3=B3n?= -Date: Sun, 17 Mar 2019 17:33:00 -0700 -Subject: [PATCH] cogl/deprecated/cogl-fixed.h: Use "static inline" instead - G_INLINE_FUNC - ---- - cogl/deprecated/cogl-fixed.c | 45 ------------------- - cogl/deprecated/cogl-fixed.h | 85 ++++++++++++++---------------------- - 2 files changed, 32 insertions(+), 98 deletions(-) - -diff --git a/cogl/deprecated/cogl-fixed.c b/cogl/deprecated/cogl-fixed.c -index bdae6cdf..24a6b106 100644 ---- a/cogl/deprecated/cogl-fixed.c -+++ b/cogl/deprecated/cogl-fixed.c -@@ -818,51 +818,6 @@ cogl_sqrti (int number) - #endif - } - --CoglFixed --cogl_fixed_mul (CoglFixed a, -- CoglFixed b) --{ --#if defined(__arm__) && !defined(__thumb__) -- /* This provides about 12% speedeup on the gcc -O2 optimised -- * C version -- * -- * Based on code found in the following thread: -- * http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2006-August/014405.html -- */ -- int res_low, res_hi; -- -- __asm__ ("smull %0, %1, %2, %3 \n" -- "mov %0, %0, lsr %4 \n" -- "add %1, %0, %1, lsl %5 \n" -- : "=&r"(res_hi), "=&r"(res_low) \ -- : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q)); -- -- return (CoglFixed) res_low; --#else -- int64_t r = (int64_t) a * (int64_t) b; -- -- return (CoglFixed) (r >> COGL_FIXED_Q); --#endif --} -- --CoglFixed --cogl_fixed_div (CoglFixed a, -- CoglFixed b) --{ -- return (CoglFixed) ((((int64_t) a) << COGL_FIXED_Q) / b); --} -- --CoglFixed --cogl_fixed_mul_div (CoglFixed a, -- CoglFixed b, -- CoglFixed c) --{ -- CoglFixed ab = cogl_fixed_mul (a, b); -- CoglFixed quo = cogl_fixed_div (ab, c); -- -- return quo; --} -- - /* - * The log2x() and pow2x() functions - * -diff --git a/cogl/deprecated/cogl-fixed.h b/cogl/deprecated/cogl-fixed.h -index 73d0ed59..106c5138 100644 ---- a/cogl/deprecated/cogl-fixed.h -+++ b/cogl/deprecated/cogl-fixed.h -@@ -536,18 +536,44 @@ cogl_fixed_atan2 (CoglFixed a, - /*< public >*/ - - /* Fixed point math routines */ --G_INLINE_FUNC CoglFixed -+static inline CoglFixed - cogl_fixed_mul (CoglFixed a, -- CoglFixed b); -+ CoglFixed b) -+{ -+# ifdef __arm__ -+ int res_low, res_hi; -+ -+ __asm__ ("smull %0, %1, %2, %3 \n" -+ "mov %0, %0, lsr %4 \n" -+ "add %1, %0, %1, lsl %5 \n" -+ : "=r"(res_hi), "=r"(res_low)\ -+ : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q)); -+ -+ return (CoglFixed) res_low; -+# else -+ long long r = (long long) a * (long long) b; -+ -+ return (unsigned int)(r >> COGL_FIXED_Q); -+# endif -+} - --G_INLINE_FUNC CoglFixed -+static inline CoglFixed - cogl_fixed_div (CoglFixed a, -- CoglFixed b); -+ CoglFixed b) -+{ -+ return (CoglFixed) ((((int64_t) a) << COGL_FIXED_Q) / b); -+} - --G_INLINE_FUNC CoglFixed -+static inline CoglFixed - cogl_fixed_mul_div (CoglFixed a, - CoglFixed b, -- CoglFixed c); -+ CoglFixed c) -+{ -+ CoglFixed ab = cogl_fixed_mul (a, b); -+ CoglFixed quo = cogl_fixed_div (ab, c); -+ -+ return quo; -+} - - /** - * COGL_SQRTI_ARG_MAX: -@@ -750,53 +776,6 @@ cogl_angle_tan (CoglAngle angle); - CoglFixed - cogl_angle_cos (CoglAngle angle); - --/*< private >*/ -- --#if defined (G_CAN_INLINE) --G_INLINE_FUNC CoglFixed --cogl_fixed_mul (CoglFixed a, -- CoglFixed b) --{ --# ifdef __arm__ -- int res_low, res_hi; -- -- __asm__ ("smull %0, %1, %2, %3 \n" -- "mov %0, %0, lsr %4 \n" -- "add %1, %0, %1, lsl %5 \n" -- : "=r"(res_hi), "=r"(res_low)\ -- : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q)); -- -- return (CoglFixed) res_low; --# else -- long long r = (long long) a * (long long) b; -- -- return (unsigned int)(r >> COGL_FIXED_Q); --# endif --} --#endif -- --#if defined (G_CAN_INLINE) --G_INLINE_FUNC CoglFixed --cogl_fixed_div (CoglFixed a, -- CoglFixed b) --{ -- return (CoglFixed) ((((int64_t) a) << COGL_FIXED_Q) / b); --} --#endif -- --#if defined(G_CAN_INLINE) --G_INLINE_FUNC CoglFixed --cogl_fixed_mul_div (CoglFixed a, -- CoglFixed b, -- CoglFixed c) --{ -- CoglFixed ab = cogl_fixed_mul (a, b); -- CoglFixed quo = cogl_fixed_div (ab, c); -- -- return quo; --} --#endif -- - CoglFixed - cogl_double_to_fixed (double value); - --- -2.21.0 - diff --git a/cogl.spec b/cogl.spec index ca8288a..bb6b2ab 100644 --- a/cogl.spec +++ b/cogl.spec @@ -1,8 +1,8 @@ %global with_tests 1 Name: cogl -Version: 1.22.2 -Release: 13%{?dist} +Version: 1.22.4 +Release: 1%{?dist} Summary: A library for using 3D graphics hardware to draw pretty pictures License: LGPLv2+ @@ -23,11 +23,6 @@ Patch1: 0002-add-GL_ARB_shader_texture_lod-support.patch # and do post blurring. Patch2: 0003-texture-support-copy_sub_image.patch -# Fix use of deprecated G_INLINE_FUNC which broke builds of dependent -# packages -# https://gitlab.gnome.org/GNOME/cogl/merge_requests/8 -Patch3: 0001-cogl-deprecated-cogl-fixed.h-Use-static-inline-inste.patch - BuildRequires: chrpath BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) @@ -50,11 +45,6 @@ BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(xkbcommon) -%if 0%{?fedora} -# From rhughes-f20-gnome-3-12 copr -Obsoletes: compat-cogl116 < 1.18 -%endif - %description Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. The API departs from the flat state machine style of @@ -97,11 +87,7 @@ This package contains the installable tests for %{cogl}. %endif %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 %build CFLAGS="$RPM_OPT_FLAGS -fPIC" @@ -163,6 +149,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcogl-pango.so %endif %changelog +* Wed Apr 24 2019 Peter Robinson 1.22.4-1 +- Update to 1.22.4 + * Tue Apr 16 2019 Adam Williamson - 1.22.2-13 - Backport MR#8 to fix builds of cogl-using packages in F31+ diff --git a/sources b/sources index e7f203a..e337c43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cogl-1.22.2.tar.xz) = 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 +SHA512 (cogl-1.22.4.tar.xz) = 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a