Compare commits

...

5 Commits

Author SHA1 Message Date
David Abdurachmanov c1693f9c81
Fix patch level for GNU Make 4.3 patch
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-04-03 12:50:20 +03:00
David Abdurachmanov 33b39615fa
Fix compilation erros with GNU Make 4.3
https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-04-03 12:20:00 +03:00
David Abdurachmanov 9841b4d7e2
Rebase riscv64 patch
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-04-03 10:16:57 +03:00
David Abdurachmanov ff4d3d8eee
Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-04-03 10:09:00 +03:00
David Abdurachmanov 7e0341b9bd
Add support for RISC-V (riscv64)
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
2018-06-19 21:11:47 +02:00
3 changed files with 86 additions and 1 deletions

38
fix-for-make-4.3.patch Normal file
View File

@ -0,0 +1,38 @@
From 52adcdb89a9eb527df38c569539d95c1c7aeda6e Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@gnu.org>
Date: Thu, 12 Mar 2020 18:11:47 +0100
Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
GNU Make 4.3 has a backwards incompatible change affecting the use of
number signs or hashes (ie., #) inside function invocations. See:
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
argument to the foreach call to '\#', not '#'. This would lead to
spurious backslashes in front of the '#include' directives in the
generated fs-enumtypes.c file.
Spotted by Ernestas Kulik.
https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4
---
gst-glib-gen.mak | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gst-glib-gen.mak b/gst-glib-gen.mak
index 76b2233..bcb4240 100644
--- a/gst-glib-gen.mak
+++ b/gst-glib-gen.mak
@@ -8,7 +8,8 @@
#glib_gen_decl_banner=GST_EXPORT
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+hash:=\#
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
# these are all the rules generating the relevant files
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
--
2.24.1

View File

@ -0,0 +1,35 @@
diff --git a/common/m4/gst-arch.m4 b/common/m4/gst-arch.m4
index 4ad7680..6da10fc 100644
--- a/common/m4/gst-arch.m4
+++ b/common/m4/gst-arch.m4
@@ -81,6 +81,9 @@ AC_DEFUN([AG_GST_ARCH],
xcrisv32)
HAVE_CPU_CRISV32=yes
AC_DEFINE(HAVE_CPU_CRISV32, 1, [Define if the target CPU is a CRISv32]) ;;
+ xriscv64)
+ HAVE_CPU_RISCV64=yes
+ AC_DEFINE(HAVE_CPU_RISCV64, 1, [Define if the target CPU is RISCV64]) ;;
esac
dnl Determine endianness
@@ -111,7 +114,7 @@ AC_DEFUN([AG_GST_UNALIGNED_ACCESS], [
AC_MSG_CHECKING([if unaligned memory access works correctly])
if test x"$as_cv_unaligned_access" = x ; then
case $host in
- alpha*|arc*|arm*|aarch64*|hp*|mips*|sh*|sparc*|ia64*)
+ alpha*|arc*|arm*|aarch64*|hp*|mips*|sh*|sparc*|ia64*|riscv*)
_AS_ECHO_N([(blacklisted) ])
as_cv_unaligned_access=no
;;
diff --git a/meson.build b/meson.build
index 0442535..3dfc8f5 100644
--- a/meson.build
+++ b/meson.build
@@ -169,6 +169,7 @@ host_defines = [
[ 'hppa', 'HAVE_CPU_HPPA' ],
[ 'm68k', 'HAVE_CPU_M68K' ],
[ 's390', 'HAVE_CPU_S390' ],
+ [ 'riscv64', 'HAVE_CPU_RISCV64' ],
]
foreach h : host_defines
if h.get(0) == host_machine.cpu()

View File

@ -11,7 +11,7 @@
Name: gstreamer1
Version: 1.16.2
Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist}
Release: 2%{?gitcommit:.git%{shortcommit}}.0.riscv64%{?dist}
Summary: GStreamer streaming media framework runtime
License: LGPLv2+
@ -25,6 +25,9 @@ Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{versi
%endif
## For GStreamer RPM provides
Patch0: gstreamer-inspect-rpm-format.patch
Patch1: gstreamer-add-riscv64.patch
# https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4
Patch2: fix-for-make-4.3.patch
Source1: gstreamer1.prov
Source2: gstreamer1.attr
@ -93,6 +96,11 @@ GStreamer streaming media framework.
%prep
%setup -q -n gstreamer-%{version}
%patch0 -p1 -b .rpm-provides
%patch1 -p1 -b .riscv64
pushd common
%patch2 -p1 -b .fix-make43
popd
%build
NOCONFIGURE=1 \
@ -209,6 +217,10 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog
* Fri Apr 03 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.16.2-2.0.riscv64
- Add support for RISC-V (riscv64)
- Fix compilation errors with GNU Make 4.3
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild