[desmume] Fixed FTBFS Added soundtouch-devel and libpcap-devel to BR
commit 3c247e126fc2e94c6050ce6812e83ed3313d8c83
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Mar 19 20:55:29 2017 +0100
Fixed FTBFS
Added soundtouch-devel and libpcap-devel to BR
desmume-0.9.11-null_terminator.patch | 12 ++++++++++++
desmume.spec | 18 ++++++++++++++----
2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/desmume-0.9.11-null_terminator.patch b/desmume-0.9.11-null_terminator.patch
new file mode 100644
index 0000000..2eda1b9
--- /dev/null
+++ b/desmume-0.9.11-null_terminator.patch
@@ -0,0 +1,12 @@
+diff -durN desmume-0.9.11.orig/src/utils/libfat/directory.cpp
desmume-0.9.11/src/utils/libfat/directory.cpp
+--- desmume-0.9.11.orig/src/utils/libfat/directory.cpp 2015-02-14 16:05:26.000000000
+0100
++++ desmume-0.9.11/src/utils/libfat/directory.cpp 2017-03-19 20:35:34.605607809 +0100
+@@ -139,7 +139,7 @@
+ int bytes;
+ size_t count = 0;
+
+- while (count < len-1 && src != '\0') {
++ while (count < len-1 && *src != '\0') {
+ bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
+ if (bytes > 0) {
+ *dst = (ucs2_t)tempChar;
diff --git a/desmume.spec b/desmume.spec
index c201b50..cc1177e 100644
--- a/desmume.spec
+++ b/desmume.spec
@@ -1,6 +1,6 @@
Name: desmume
Version: 0.9.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Nintendo DS emulator
License: GPLv2+
@@ -10,19 +10,23 @@ Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-0.9.11-dontlookinbuilddir.patch
# Use system tinyxml instead of the embedded copy
Patch1: %{name}-0.9.11-tinyxml.patch
+# Compile with gcc6
Patch2: gcc6_fixes.patch
+# Fix check for null terminator
+Patch3: %{name}-0.9.11-null_terminator.patch
BuildRequires: gtkglext-devel
BuildRequires: libglade2-devel
BuildRequires: openal-soft-devel
-BuildRequires: compat-lua-devel
+BuildRequires: lua-devel
BuildRequires: zziplib-devel
+# Retired from Fedora for F25+
%if 0%{?fedora} <= 24
BuildRequires: agg-devel
%endif
BuildRequires: tinyxml-devel
-# Not yet in Fedora
-#BuildRequires: soundtouch-devel >= 1.5.0
+BuildRequires: soundtouch-devel >= 1.5.0
+BuildRequires: libpcap-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
@@ -58,6 +62,7 @@ This is the CLI version.
%patch1 -p1
sed -i 's/\r//' src/MMU_timing.h
%patch2 -p1
+%patch3 -p1
# Remove bundled tinyxml
rm -rf src/utils/tinyxml
@@ -91,6 +96,7 @@ sed -i
's|GETTEXT_PACKAGE=desmume|GETTEXT_PACKAGE=desmume-glade|g' configure{,.a
%build
%configure \
+ --enable-glx \
--enable-openal \
--enable-glade \
--enable-wifi
@@ -187,6 +193,10 @@ fi
%changelog
+* Sun Mar 19 2017 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.11-4
+- Fixed FTBFS
+- Added soundtouch-devel and libpcap-devel to BR
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> -
0.9.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild