From f7f228bbaf3c87447ad8b2bbfdf8d5d4129b34d8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 24 Sep 2019 11:49:55 +0200 Subject: [PATCH] Update to 0.4.30 Use meson as autogen was removed --- .gitignore | 1 + orc-0.4.29-ppc64-revert.patch | 73 ----------------------------------- orc.spec | 31 ++++++--------- sources | 2 +- 4 files changed, 13 insertions(+), 94 deletions(-) delete mode 100644 orc-0.4.29-ppc64-revert.patch diff --git a/.gitignore b/.gitignore index 4f1f71f..16aec6f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /orc-0.4.27.tar.xz /orc-0.4.28.tar.xz /orc-0.4.29.tar.xz +/orc-0.4.30.tar.xz diff --git a/orc-0.4.29-ppc64-revert.patch b/orc-0.4.29-ppc64-revert.patch deleted file mode 100644 index 30a4502..0000000 --- a/orc-0.4.29-ppc64-revert.patch +++ /dev/null @@ -1,73 +0,0 @@ -From b02d7e797a9d66fe22c131526b46524171675319 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 10 May 2019 12:55:06 +0200 -Subject: [PATCH 1/2] Revert "PowerPC: Support ELFv2 ABI" - -This reverts commit 4e080ed8d64e73465ffe9f79d95b56ff184cf01a. ---- - orc/orcpowerpc.c | 2 +- - orc/orcprogram-altivec.c | 2 -- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c -index 8eeb4e5..a6835ba 100644 ---- a/orc/orcpowerpc.c -+++ b/orc/orcpowerpc.c -@@ -418,7 +418,7 @@ orc_powerpc_flush_cache (OrcCode *code) - int size = code->code_size; - - ptr = code->code; --#if defined(__powerpc64__) && (!defined(_CALL_ELF) || _CALL_ELF == 1) -+#ifdef __powerpc64__ - *(unsigned char **) ptr = (unsigned char *) code->exec + 24; - #endif - for (i=0;iprogram->name); - - if (compiler->is_64bit) { --#if !defined(_CALL_ELF) || _CALL_ELF == 1 - ORC_ASM_CODE (compiler, " .quad .%s,.TOC.@tocbase,0\n", - compiler->program->name); - ORC_ASM_CODE (compiler, ".%s:\n", compiler->program->name); - powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); - powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); - powerpc_emit (compiler, 0); powerpc_emit (compiler, 0); --#endif - powerpc_emit_stdu (compiler, POWERPC_R1, POWERPC_R1, -16); - } else { - powerpc_emit_stwu (compiler, POWERPC_R1, POWERPC_R1, -16); --- -2.21.0 - - -From e51942caa119b27693ca9aad8b5c2780d10ccb32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 10 May 2019 12:57:52 +0200 -Subject: [PATCH 2/2] Revert "Add support for ppc64le" - -This reverts commit 7e504fa1367b15c12807da1053a51db528f37c79. ---- - m4/as-host-defines.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/as-host-defines.m4 b/m4/as-host-defines.m4 -index 4a6ae45..7223c51 100644 ---- a/m4/as-host-defines.m4 -+++ b/m4/as-host-defines.m4 -@@ -19,7 +19,7 @@ AC_DEFUN([AS_HOST_DEFINES], - HAVE_AMD64=yes - AC_DEFINE(HAVE_AMD64, 1, [Defined if host is amd64]) - ;; -- xpowerpc|xppc|xpowerpc64*|xppc64*) -+ xpowerpc|xppc|xpowerpc64|xppc64) - HAVE_POWERPC=yes - AC_DEFINE(HAVE_POWERPC, 1, [Defined if host is powerpc]) - ;; --- -2.21.0 - diff --git a/orc.spec b/orc.spec index 9c4d3b1..80e9cc1 100644 --- a/orc.spec +++ b/orc.spec @@ -1,14 +1,11 @@ Name: orc -Version: 0.4.29 -Release: 3%{?dist} +Version: 0.4.30 +Release: 1%{?dist} Summary: The Oil Run-time Compiler License: BSD URL: http://cgit.freedesktop.org/gstreamer/orc/ Source0: http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz -# https://gitlab.freedesktop.org/gstreamer/orc/issues/19 -# revert commits changing ppc64/ppc64le support -Patch0: orc-0.4.29-ppc64-revert.patch BuildRequires: gtk-doc, libtool @@ -48,33 +45,23 @@ The Orc compiler, to produce optimized code. %prep %setup -q -%patch0 -p1 -gtkdocize --copy -NOCONFIGURE=1 autoreconf -vif - %build -%configure --disable-static --enable-gtk-doc --enable-user-codemem --disable-gtk-doc-html - -make %{?_smp_mflags} V=1 - +%meson -D default_library=shared +%meson_build %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%meson_install # Remove unneeded files. -find %{buildroot}/%{_libdir} -name \*.a -or -name \*.la -delete +find %{buildroot}/%{_libdir} -name \*.a -delete rm -rf %{buildroot}/%{_libdir}/orc -touch -r stamp-h1 %{buildroot}%{_includedir}/%{name}-0.4/orc/orc-stdint.h - - %check %ifnarch s390 s390x ppc %{power64} %{arm} i686 aarch64 -make check +%meson_test %endif - %ldconfig_scriptlets @@ -99,6 +86,10 @@ make check %changelog +* Tue Sep 24 2019 Wim Taymans 0.4.30-1 +- Update to 0.4.30 +- Use meson as autogen was removed + * Thu Jul 25 2019 Fedora Release Engineering - 0.4.29-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 105c41c..55b2dfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orc-0.4.29.tar.xz) = 57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 +SHA512 (orc-0.4.30.tar.xz) = da254347f5ebb278f0932a7bfa878adc2a14c42c7e6a20a4e6bb68c0883e307fef57bef867d54e150bd1d875f79eee27f9d34aede410d3eddd4093e5b055cd22