[audacious-plugins-freeworld] Rebuild for new faad2 version
by Leigh Scott
commit 2554ef6977487bd9e4c34d2c691c6194c728f48f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 8 00:09:08 2023 +0000
Rebuild for new faad2 version
audacious-plugins-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index bfad662..f5c331d 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -6,7 +6,7 @@
Name: audacious-plugins-freeworld
Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
License: GPLv3
URL: https://audacious-media-player.org/
@@ -83,6 +83,9 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Wed Nov 08 2023 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-2
+- Rebuild for new faad2 version
+
* Sun Nov 05 2023 Sérgio Basto <sergio(a)serjux.com> - 4.3.1-1
- Update audacious-plugins-freeworld to 4.3.1
1 year
[faad2] fix
by Leigh Scott
commit f1461dbfe6440b5ac89bf8147c8151ab554a39f8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Nov 7 23:13:33 2023 +0000
fix
faad2-drop-lrintf-redefinition.patch | 11 +++++++++++
faad2.spec | 1 +
2 files changed, 12 insertions(+)
---
diff --git a/faad2-drop-lrintf-redefinition.patch b/faad2-drop-lrintf-redefinition.patch
new file mode 100644
index 0000000..20a7565
--- /dev/null
+++ b/faad2-drop-lrintf-redefinition.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.15)
+
+ project(LIBFAAD2 LANGUAGES C)
+
++add_definitions(-DHAVE_LRINTF)
++
+ # If FAAD is being bundled in another project, we don't want to
+ # install anything. However, we want to let people override this, so
+ # we'll use the FAAD_BUNDLED_MODE variable to let them do that; just
diff --git a/faad2.spec b/faad2.spec
index 30e4afd..0c82e05 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -6,6 +6,7 @@ Release: 1%{?dist}
License: GPLv2+
URL: http://www.audiocoding.com/faad2.html
Source: https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0: faad2-drop-lrintf-redefinition.patch
BuildRequires: gcc-c++
1 year
[faad2] Update to 2.11.0
by Leigh Scott
commit fb34bd833b53378e4ec984e100649a06d787804d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Nov 7 22:52:35 2023 +0000
Update to 2.11.0
faad2.spec | 35 +++++++++++++++--------------------
sources | 2 +-
2 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/faad2.spec b/faad2.spec
index e5ab69e..30e4afd 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -1,18 +1,18 @@
Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
-Version: 2.10.1
-Release: 2%{?dist}
+Version: 2.11.0
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.audiocoding.com/faad2.html
Source: https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: cmake
BuildRequires: libsysfs-devel
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-xmms < %{version}-%{release}
%description
@@ -21,7 +21,6 @@ written from scratch.
%package libs
Summary: Shared libraries of the FAAD 2 AAC decoder
-Obsoletes: %{name} < 1:2.6.1-3
%description libs
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@@ -41,45 +40,41 @@ This package contains development files and documentation for libfaad.
%prep
%autosetup -p1
-./bootstrap
%build
-%configure \
- --disable-static
-
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%cmake
-%make_build
+%cmake_build
%install
-%make_install
-
-#Remove libtool archives.
-find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
-
+%cmake_install
+install -m 0755 -d %{buildroot}%{_mandir}/man{1,3}
+install -D -m 644 frontend/faad.man %{buildroot}%{_mandir}/man1/faad.1
+install -D -m 644 docs/libfaad.3 -t %{buildroot}%{_mandir}/man3/
%ldconfig_scriptlets libs
%files
-%doc AUTHORS ChangeLog NEWS README*
+%doc AUTHORS ChangeLog README*
%license COPYING
%{_bindir}/faad
%{_mandir}/man1/faad.1*
%files libs
%{_libdir}/libfaad*.so.*
+%{_mandir}/man3/libfaad.3*
%files devel
-%doc TODO
%{_includedir}/faad.h
%{_includedir}/neaacdec.h
%{_libdir}/pkgconfig/faad2.pc
%{_libdir}/libfaad*.so
%changelog
+* Tue Nov 07 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1:2.11.0-1
+- Update to 2.11.0
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:2.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 8bc9e7a..52fe5e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (faad2-2.10.1.tar.gz) = 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
+SHA512 (faad2-2.11.0.tar.gz) = b85aab9b2d2afdca7096c999bcb7fabfccce4781760d9eb14d23fdd38691729927b09464708abf49a751e70c4475151ca14c5a7419b5cf4d9ec70c433dc86282
1 year
[fceux] Added a patch to fix building on non-x86 CPUs
by Andrea Musuruane
commit 14ec7800d010bec3e668a390e131f4ba03c48c25
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Tue Nov 7 16:08:38 2023 +0100
Added a patch to fix building on non-x86 CPUs
fceux-2.6.6-timestamp-nonx86.patch | 42 ++++++++++++++++++++++++++++++++++++++
fceux.spec | 8 +++++++-
2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/fceux-2.6.6-timestamp-nonx86.patch b/fceux-2.6.6-timestamp-nonx86.patch
new file mode 100644
index 0000000..7096d59
--- /dev/null
+++ b/fceux-2.6.6-timestamp-nonx86.patch
@@ -0,0 +1,42 @@
+diff --git a/src/utils/timeStamp.cpp b/src/utils/timeStamp.cpp
+index f62d019f..efb45aac 100644
+--- a/src/utils/timeStamp.cpp
++++ b/src/utils/timeStamp.cpp
+@@ -14,6 +14,7 @@
+ //-------------------------------------------------------------------------
+ //---- Time Stamp Record
+ //-------------------------------------------------------------------------
++#ifdef __FCEU_X86_TSC_ENABLE
+ #if defined(WIN32)
+ #include <intrin.h>
+ #pragma intrinsic(__rdtsc)
+@@ -25,6 +26,7 @@ static uint64_t rdtsc()
+ {
+ return __rdtsc();
+ }
++#endif
+
+ namespace FCEU
+ {
+@@ -36,12 +38,15 @@ uint64_t timeStampRecord::qpcFreq = 0;
+
+ void timeStampRecord::readNew(void)
+ {
+-#if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
+- clock_gettime( CLOCK_REALTIME, &ts );
+-#else
+- QueryPerformanceCounter((LARGE_INTEGER*)&ts);
+-#endif
+- tsc = rdtsc();
++ #ifdef __FCEU_X86_TSC_ENABLE
++ tsc = rdtsc();
++ #endif
++
++ #if defined(__linux__) || defined(__APPLE__) || defined(__unix__)
++ clock_gettime( CLOCK_REALTIME, &ts );
++ #else
++ QueryPerformanceCounter((LARGE_INTEGER*)&ts);
++ #endif
+ }
+ #if defined(WIN32)
+ void timeStampRecord::qpcCalibrate(void)
diff --git a/fceux.spec b/fceux.spec
index 71857d3..11f86de 100644
--- a/fceux.spec
+++ b/fceux.spec
@@ -3,13 +3,16 @@
Name: fceux
Version: 2.6.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
License: GPLv2+
URL: http://fceux.com/
Source: https://github.com/TASEmulators/fceux/archive/v%{version}.tar.gz#/%{name}...
Patch0: gcc13.patch
+# Added feature macro __FCEU_X86_TSC_ENABLE to enable usage of the X86 TSC
+# https://github.com/TASEmulators/fceux/issues/663
+Patch1: fceux-2.6.6-timestamp-nonx86.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -114,6 +117,9 @@ desktop-file-validate \
%changelog
+* Tue Nov 07 2023 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.6-2
+- Added a patch to fix building on non-x86 CPUs
+
* Wed Aug 30 2023 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.6-1
- Updated to new upstream release
1 year
[discord/f37] Update discord to 0.0.34
by Sérgio M. Basto
Summary of changes:
973bb55... Update discord to 0.0.34 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year
[discord/f38] Update discord to 0.0.34
by Sérgio M. Basto
Summary of changes:
973bb55... Update discord to 0.0.34 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year
[discord/f39] Update discord to 0.0.34
by Sérgio M. Basto
Summary of changes:
973bb55... Update discord to 0.0.34 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year
[fceux] Updated to new upstream release
by Andrea Musuruane
commit 1afed4715507da273c0cf0625a9c08f846f57545
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Tue Nov 7 12:44:20 2023 +0100
Updated to new upstream release
.gitignore | 1 +
fceux.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da0c929..5194d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ fceux-2.2.2.src.tar.gz
/fceux-2.6.3.tar.gz
/fceux-2.6.4.tar.gz
/fceux-2.6.5.tar.gz
+/fceux-2.6.6.tar.gz
diff --git a/fceux.spec b/fceux.spec
index e6163ee..71857d3 100644
--- a/fceux.spec
+++ b/fceux.spec
@@ -1,9 +1,9 @@
%global giturl https://github.com/TASVideos/fceux.git
-%global commit ea6ed69b874e3ae94072f1b4f14b9a8f0fdd774b
+%global commit 34eb7601c415b81901fd02afbd5cfdc84b5047ac
Name: fceux
-Version: 2.6.5
-Release: 2%{?dist}
+Version: 2.6.6
+Release: 1%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
License: GPLv2+
@@ -114,6 +114,9 @@ desktop-file-validate \
%changelog
+* Wed Aug 30 2023 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.6-1
+- Updated to new upstream release
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index a501ce9..3865d52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fceux-2.6.5.tar.gz) = 3d37583d1917783513f05bd215437401aacda3bd1930238212cbbdd6ba105236028066d7198bfd8182e6d55ded7ce293f1e5d23295d2b730ec800dc5e5652598
+SHA512 (fceux-2.6.6.tar.gz) = 0a6cff4c6b900569978003675812d92d893281c2bdf3b0b58c07e257251648ee325f9bb29b01253ab1a5e9354631d91a6e67a1e6bb36ebe89d5067509cabfa64
1 year
