[dosemu] Don't mark pointers to be modified as const (bug 5663) Disable lto for now
by Mamoru Tasaka
commit 1f3775e252cea7dfb72f931ac5f46c999299523f
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Fri Aug 28 11:30:14 2020 +0900
Don't mark pointers to be modified as const (bug 5663)
Disable lto for now
...on-t-mark-pointer-to-be-modified-as-const.patch | 59 ++++++++++++++++++++++
dosemu.spec | 17 ++++++-
2 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/0001-memory.h-don-t-mark-pointer-to-be-modified-as-const.patch b/0001-memory.h-don-t-mark-pointer-to-be-modified-as-const.patch
new file mode 100644
index 0000000..304fc5b
--- /dev/null
+++ b/0001-memory.h-don-t-mark-pointer-to-be-modified-as-const.patch
@@ -0,0 +1,59 @@
+From e8c7950a17b7821eff628e191727b13869cddbb2 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
+Date: Sun, 23 Aug 2020 16:21:55 +0900
+Subject: [PATCH] memory.h: don't mark pointer to be modified as const
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1866474
+https://bugzilla.rpmfusion.org/show_bug.cgi?id=5663
+
+Pointers to be modified cannot be declared as "const *". gcc10 defaults to -fno-common,
+and with this flag, trying to modify "const *" pointer variable causes segfault.
+---
+ src/arch/linux/mapping/mapping.c | 4 ++--
+ src/include/memory.h | 7 ++-----
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/arch/linux/mapping/mapping.c b/src/arch/linux/mapping/mapping.c
+index 1d6c0725..19055434 100644
+--- a/src/arch/linux/mapping/mapping.c
++++ b/src/arch/linux/mapping/mapping.c
+@@ -47,8 +47,8 @@ static int kmem_mappings = 0;
+ static struct mem_map_struct kmem_map[MAX_KMEM_MAPPINGS];
+
+ static int init_done = 0;
+-unsigned char * const mem_base;
+-char * const lowmem_base;
++unsigned char * mem_base;
++char * lowmem_base;
+
+ static struct mappingdrivers *mappingdrv[] = {
+ #ifdef HAVE_SHM_OPEN
+diff --git a/src/include/memory.h b/src/include/memory.h
+index a5d6e96a..3d362a07 100644
+--- a/src/include/memory.h
++++ b/src/include/memory.h
+@@ -213,7 +213,7 @@ void *lowmemp(const void *ptr);
+ restrictions it can be non-zero. Non-zero values block vm86 but at least
+ give NULL pointer protection.
+ */
+-extern unsigned char * const mem_base;
++extern unsigned char * mem_base;
+
+ /* lowmem_base points to a shared memory image of the area 0--1MB+64K.
+ It does not have any holes or mapping for video RAM etc.
+@@ -221,11 +221,8 @@ extern unsigned char * const mem_base;
+ DOSEMU writes will not be trapped. This allows easy interference with
+ simx86, NULL page protection, and removal of the VGA protected memory
+ access hack.
+-
+- It is set "const" to help GCC optimize accesses. In reality it is set only
+- once, at startup
+ */
+-extern char * const lowmem_base;
++extern char * lowmem_base;
+
+ #define UNIX_READ_BYTE(addr) (*(Bit8u *) (addr))
+ #define UNIX_WRITE_BYTE(addr, val) (*(Bit8u *) (addr) = (val) )
+--
+2.26.2
+
diff --git a/dosemu.spec b/dosemu.spec
index 66271be..fdb9ef1 100644
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -1,6 +1,6 @@
Name: dosemu
Version: 1.4.0.8
-Release: 27.20131022git%{?dist}
+Release: 28.20131022git%{?dist}
Summary: DOS Emulator for Linux
URL: http://dosemu.sf.net
License: GPLv2+
@@ -20,6 +20,11 @@ License: GPLv2+
Source: %{name}-%{version}.tgz
+# https://bugzilla.redhat.com/show_bug.cgi?id=1866474
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=5663
+# memory.h: don't mark pointer to be modified as const
+Patch0: 0001-memory.h-don-t-mark-pointer-to-be-modified-as-const.patch
+
# Made a FreeDOS bootable image, must be done manually.
Source1: %{name}-freedos-bin.tgz
@@ -58,8 +63,12 @@ programs forever!
%prep
-%autosetup
+%autosetup -p1
+# lto doesn't seem to work:
+# DEBUG: /usr/bin/ld: /tmp/dosemu.bin.1hmolM.ltrans0.ltrans.o: in function `stub_rep__':
+# DEBUG: <artificial>:(.text+0xe): undefined reference to `rep_movs_stos'
+%define _lto_cflags %{nil}
%build
%configure --with-fdtarball=%{SOURCE1}
@@ -110,6 +119,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog
+* Sun Aug 23 2020 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.4.0.8-28.20131022git
+- Don't mark pointers to be modified as const (bug 5663)
+- Disable lto for now
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.4.0.8-27.20131022git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years, 3 months
[gr-dab/f33] Rebuilt for new gnuradio
by Leigh Scott
Summary of changes:
ae5c311... Rebuilt for new gnuradio (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[gr-dab] Rebuilt for new gnuradio
by Leigh Scott
commit ae5c311498b0fdab729a2ba32839b04bfc5cbece
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 28 19:51:52 2020 +0100
Rebuilt for new gnuradio
gr-dab.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gr-dab.spec b/gr-dab.spec
index 107ecae..971e10a 100644
--- a/gr-dab.spec
+++ b/gr-dab.spec
@@ -9,7 +9,7 @@
Name: gr-dab
URL: https://github.com/andrmuel/gr-dab
Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
BuildRequires: cmake3, gcc-c++, python3-devel, python3-scipy, gnuradio-devel
BuildRequires: python3-matplotlib, cppunit-devel, boost-devel, doxygen, fftw-devel
@@ -84,6 +84,9 @@ make test
%doc %{_docdir}/%{name}/xml
%changelog
+* Fri Aug 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.4-5
+- Rebuilt for new gnuradio
+
* Mon Aug 24 2020 Jaroslav Škarvada <jskarvad(a)redhat.com> - 0.4-4
- Rebuilt for new gnuradio
4 years, 3 months
[libheif/f33] Update to 1.8.0
by Leigh Scott
Summary of changes:
58bc66e... Update to 1.8.0 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[libheif] Update to 1.8.0
by Leigh Scott
commit 58bc66e04d4f4552e1e07e71a5df357a7cf4252e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 28 17:16:18 2020 +0100
Update to 1.8.0
libheif.spec | 20 +++++++++++++++-----
sources | 2 +-
system_rav1e.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 6 deletions(-)
---
diff --git a/libheif.spec b/libheif.spec
index 55c12bb..b5bacc5 100644
--- a/libheif.spec
+++ b/libheif.spec
@@ -1,11 +1,12 @@
Name: libheif
-Version: 1.7.0
-Release: 3%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: HEIF file format decoder and encoder
License: LGPLv3+ and MIT
URL: https://github.com/strukturag/%{name}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: system_rav1e.patch
BuildRequires: autoconf
BuildRequires: gcc-c++
@@ -19,6 +20,9 @@ BuildRequires: pkgconfig(libjpeg)
BuildRequires: libjpeg-devel
%endif
BuildRequires: pkgconfig(libpng)
+%if 0%{?fedora} > 32
+BuildRequires: pkgconfig(rav1e)
+%endif
BuildRequires: pkgconfig(x265)
Requires: shared-mime-info
@@ -38,12 +42,15 @@ developing applications that use %{name}.
%prep
-%autosetup
+%autosetup -p1
NOCONFIGURE=1 ./autogen.sh
%build
-%configure --disable-static
+%configure --disable-static \
+%if 0%{?fedora} > 32
+ --enable-local-rav1e
+%endif
%make_build
@@ -64,7 +71,7 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f
%{_bindir}/heif-thumbnailer
%{_libdir}/*.so.1*
%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-heif.*
-%{_datadir}/mime/packages/heif.xml
+%{_datadir}/mime/packages/*.xml
%{_datadir}/thumbnailers/
%{_mandir}/man1/heif-*
@@ -75,6 +82,9 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f
%changelog
+* Fri Aug 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.0-1
+- Update to 1.8.0
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 50e2a4c..4fc4500 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libheif-1.7.0.tar.gz) = 7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660
+SHA512 (libheif-1.8.0.tar.gz) = e5116530190a6bd97a6788393a3070be54e432ffd43045fa4b7a028f2a7f652d6bc09b7bf5992a6fb2b3cf6669f29a269f2007099cfef661e17732cf1b09debe
diff --git a/system_rav1e.patch b/system_rav1e.patch
new file mode 100644
index 0000000..5d3ff58
--- /dev/null
+++ b/system_rav1e.patch
@@ -0,0 +1,33 @@
+--- a/libheif/Makefile.am
++++ b/libheif/Makefile.am
+@@ -22,7 +22,7 @@
+ endif
+
+ if ENABLE_LOCAL_RAV1E
+-ADDITIONAL_LIBS += ../third-party/rav1e/target/release/librav1e.a
++ADDITIONAL_LIBS += -lrav1e
+ endif
+
+ libheif_la_CPPFLAGS =
+@@ -38,7 +38,7 @@
+ libheif_la_LIBADD = $(ADDITIONAL_LIBS)
+
+ if ENABLE_LOCAL_RAV1E
+-libheif_la_CXXFLAGS += -I../third-party/rav1e/target/release/include
++libheif_la_CXXFLAGS += -I/usr/include/rav1e
+ endif
+
+ libheif_la_LDFLAGS = -version-info $(LIBHEIF_CURRENT):$(LIBHEIF_REVISION):$(LIBHEIF_AGE)
+
+--- a/libheif/heif_encoder_rav1e.cc
++++ b/libheif/heif_encoder_rav1e.cc
+@@ -37,7 +37,7 @@
+
+ #include <iostream> // TODO: remove me
+
+-#include "rav1e/rav1e.h"
++#include <rav1e.h>
+
+
+ struct encoder_struct_rav1e
+
4 years, 3 months
[libde265/f33] Update to 1.0.6
by Leigh Scott
Summary of changes:
0326d3b... Update to 1.0.6 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months