[ffmpeg] missed release bump
by Dominik Mierzejewski
commit 565c81cf5f9c27e2e874b1d46369f089125edfa4
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Wed Mar 13 00:20:59 2024 +0100
missed release bump
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d4306fc..a1b7fcd 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -114,7 +114,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.1
-Release: 5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 6%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
8 months, 2 weeks
[ffmpeg] Enable drawtext filter (requires libharfbuzz, rfbz#6889)
by Dominik Mierzejewski
commit 5690574e6a78b7305331e7b9eccb62b629671d9b
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Wed Mar 13 00:20:20 2024 +0100
Enable drawtext filter (requires libharfbuzz, rfbz#6889)
ffmpeg.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f50edb8..d4306fc 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -149,6 +149,7 @@ BuildRequires: fribidi-devel
BuildRequires: gnupg2
BuildRequires: gnutls-devel
BuildRequires: gsm-devel
+BuildRequires: harfbuzz-devel
%{?_with_ilbc:BuildRequires: ilbc-devel}
BuildRequires: lame-devel >= 3.98.3
%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
@@ -350,6 +351,7 @@ Freeworld libavcodec to complement the distro counterparts
%{!?_without_fribidi:--enable-libfribidi} \\\
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
+ --enable-libharfbuzz \\\
%{?_with_ilbc:--enable-libilbc} \\\
%{!?_without_lensfun:--enable-liblensfun} \\\
%{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\
@@ -544,6 +546,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Tue Mar 12 2024 Dominik Mierzejewski <dominik(a)greysector.net> - 6.1.1-6
+- Enable drawtext filter (requires libharfbuzz, rfbz#6889)
+
* Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-5
- rebuilt
8 months, 2 weeks
[gpac] clean up, avoid using rm -f
by Dominik Mierzejewski
commit e1e37571713193e70f6835010051c1af6cd84af8
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Mar 12 17:46:50 2024 +0100
clean up, avoid using rm -f
gpac.spec | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index 10ed8ef..d5f5438 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -111,13 +111,12 @@ Static library for gpac.
%prep
%autosetup -p1
-rm -r extra_lib/
+rm -rv extra_lib/
pushd share/doc
# Fix encoding warnings
-cp -p ipmpx_syntax.bt ipmpx_syntax.bt.origine
-iconv -f ISO-8859-1 -t UTF8 ipmpx_syntax.bt.origine > ipmpx_syntax.bt
-touch -r ipmpx_syntax.bt.origine ipmpx_syntax.bt
-rm -rf share/doc/ipmpx_syntax.bt.origine
+iconv -f ISO-8859-1 -t UTF8 ipmpx_syntax.bt > ipmpx_syntax.bt.utf8
+touch -r ipmpx_syntax.bt{,.utf8}
+mv ipmpx_syntax.bt{.utf8,}
popd
sed -i 's/-O0 $CFLAGS/$CFLAGS/' configure
sed -i 's/-O3 $CFLAGS/$CFLAGS/' configure
@@ -137,8 +136,8 @@ sed -i 's/dh_link/ln -s -r/' Makefile
#Avoid mess with setup.h
cp -p config.h include/gpac
-%{make_build} all
-%{make_build} sggen
+%make_build all
+%make_build sggen
## kwizart - build doxygen doc for devel
pushd share/doc
@@ -146,8 +145,7 @@ doxygen
popd
%install
-%{make_install} install-lib
-rm -rf %{buildroot}%{_bindir}/Osmo4
+%make_install install-lib
#Install generated sggen binaries
#for b in MPEG4 SVG X3D; do
@@ -167,9 +165,8 @@ touch -r Changelog %{buildroot}%{_includedir}/gpac/*.h
touch -r Changelog %{buildroot}%{_includedir}/gpac/internal/*.h
touch -r Changelog %{buildroot}%{_includedir}/gpac/modules/*.h
rm %{buildroot}%{_includedir}/gpac/config.h
-
-
-%ldconfig_scriptlets libs
+# do not include in gpac, only here to create doxygen group for doc ordering
+rm %{buildroot}%{_includedir}/gpac/00_doxy.h
%files
%doc Changelog README.md
@@ -216,6 +213,7 @@ rm %{buildroot}%{_includedir}/gpac/config.h
- fix OSS audio disablement
- enable Nghttp2 support
- list manpages and libraries explicitly
+- clean up, avoid using rm -f
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[gpac] list manpages and libraries explicitly
by Dominik Mierzejewski
commit 558e4cb3ec7db35463b3c98fbc43fb6c40f7188c
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Mar 12 15:57:54 2024 +0100
list manpages and libraries explicitly
gpac.spec | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index 24e6aaa..10ed8ef 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -179,13 +179,21 @@ rm %{buildroot}%{_includedir}/gpac/config.h
%{_bindir}/MPEG4Gen
%{_bindir}/X3DGen
%{_datadir}/gpac/
-%{_mandir}/man1/*.1.*
-%{_datadir}/applications/*.desktop
+%{_mandir}/man1/gpac-filters.1.*
+%{_mandir}/man1/gpac.1.*
+%{_mandir}/man1/mp4box.1.*
+%{_datadir}/applications/gpac.desktop
%{_datadir}/icons/hicolor/*/apps/gpac.png
%files libs
-%{_libdir}/libgpac.so.*
-%{_libdir}/gpac/
+%{_libdir}/libgpac.so.12{,.*}
+%dir %{_libdir}/gpac
+%{_libdir}/gpac/gm_ft_font.so
+%{_libdir}/gpac/gm_jack.so
+%{_libdir}/gpac/gm_pulseaudio.so
+%{_libdir}/gpac/gm_sdl_out.so
+%{_libdir}/gpac/gm_validator.so
+%{_libdir}/gpac/gm_x11_out.so
%files doc
%doc share/doc/html-libgpac/*
@@ -207,6 +215,7 @@ rm %{buildroot}%{_includedir}/gpac/config.h
- fix building nvdec on aarch64
- fix OSS audio disablement
- enable Nghttp2 support
+- list manpages and libraries explicitly
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[gpac] enable Nghttp2 support
by Dominik Mierzejewski
commit edaa7d20955689dcddacb0f60267569bdf48867a
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Mar 12 15:38:27 2024 +0100
enable Nghttp2 support
gpac.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/gpac.spec b/gpac.spec
index d8dedf8..24e6aaa 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -41,6 +41,7 @@ BuildRequires: faad2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 1.2.5
BuildRequires: libmad-devel
+BuildRequires: libnghttp2-devel
BuildRequires: xvidcore-devel >= 1.0.0
BuildRequires: ffmpeg-devel
BuildRequires: libxml2-devel
@@ -205,6 +206,7 @@ rm %{buildroot}%{_includedir}/gpac/config.h
- fix build with zlib-ng
- fix building nvdec on aarch64
- fix OSS audio disablement
+- enable Nghttp2 support
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[gpac] fix OSS audio disablement
by Dominik Mierzejewski
commit 38044def469f730d79551435df620360bca1dac0
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Mar 12 15:22:54 2024 +0100
fix OSS audio disablement
gpac.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gpac.spec b/gpac.spec
index 31b424d..d8dedf8 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -128,7 +128,7 @@ sed -i 's/dh_link/ln -s -r/' Makefile
--extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1 $(pkg-config --cflags libavformat)" \
--X11-path=%{_prefix} \
--libdir=%{_lib} \
- --disable-oss-audio \
+ --disable-oss \
%{?_with_amr:--enable-amr} \
--enable-pic \
--verbose
@@ -204,6 +204,7 @@ rm %{buildroot}%{_includedir}/gpac/config.h
- re-enable zlib and nvdec
- fix build with zlib-ng
- fix building nvdec on aarch64
+- fix OSS audio disablement
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[gpac] re-enable zlib and nvdec
by Dominik Mierzejewski
commit 7db0bbe8746538aedcd3f6f98ae7aca2dec20894
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Mar 12 15:18:55 2024 +0100
re-enable zlib and nvdec
fix build with zlib-ng
fix building nvdec on aarch64
gpac-aarch64-nvdec.patch | 33 +++++++++++++++++++++++++++++++++
gpac-no-zmemcpy.patch | 12 ++++++++++++
gpac.spec | 21 +++++++++++++--------
3 files changed, 58 insertions(+), 8 deletions(-)
---
diff --git a/gpac-aarch64-nvdec.patch b/gpac-aarch64-nvdec.patch
new file mode 100644
index 0000000..e84c810
--- /dev/null
+++ b/gpac-aarch64-nvdec.patch
@@ -0,0 +1,33 @@
+diff -up gpac-2.2.1/src/filters/dec_nvdec_sdk.c.orig gpac-2.2.1/src/filters/dec_nvdec_sdk.c
+--- gpac-2.2.1/src/filters/dec_nvdec_sdk.c.orig 2023-04-24 12:57:53.000000000 +0000
++++ gpac-2.2.1/src/filters/dec_nvdec_sdk.c 2024-03-12 11:42:51.690883435 +0000
+@@ -197,7 +197,7 @@ tcuvidDecodePicture *c
+ tcuvidMapVideoFrame *cuvidMapVideoFrame;
+ tcuvidUnmapVideoFrame *cuvidUnmapVideoFrame;
+
+-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
++#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+ tcuvidMapVideoFrame64 *cuvidMapVideoFrame64;
+ tcuvidUnmapVideoFrame64 *cuvidUnmapVideoFrame64;
+ #endif
+diff -up gpac-2.2.1/src/filters/dec_nvdec_sdk.h.orig gpac-2.2.1/src/filters/dec_nvdec_sdk.h
+--- gpac-2.2.1/src/filters/dec_nvdec_sdk.h.orig 2023-04-24 12:57:53.000000000 +0000
++++ gpac-2.2.1/src/filters/dec_nvdec_sdk.h 2024-03-12 11:43:53.158031385 +0000
+@@ -1821,7 +1821,7 @@ typedef void *CUDADRIVER;
+
+
+
+-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
++#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+ #if (CUDA_VERSION >= 3020) && (!defined(CUDA_FORCE_API_VERSION) || (CUDA_FORCE_API_VERSION >= 3020))
+ #define __CUVID_DEVPTR64
+ #endif
+@@ -2526,7 +2526,7 @@ typedef CUresult CUDAAPI tcuvidMapVideoF
+ typedef CUresult CUDAAPI tcuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr);
+ #endif
+
+-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
++#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+ /**
+ * \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+ * map a video frame
diff --git a/gpac-no-zmemcpy.patch b/gpac-no-zmemcpy.patch
new file mode 100644
index 0000000..0fa2aff
--- /dev/null
+++ b/gpac-no-zmemcpy.patch
@@ -0,0 +1,12 @@
+diff -up gpac-2.2.1/src/utils/gzio.c.orig gpac-2.2.1/src/utils/gzio.c
+--- gpac-2.2.1/src/utils/gzio.c.orig 2023-04-24 14:57:53.000000000 +0200
++++ gpac-2.2.1/src/utils/gzio.c 2024-03-12 11:40:34.486536168 +0100
+@@ -407,7 +407,7 @@ int gf_gzread(void *file, voidp buf, uns
+ uInt n = s->stream.avail_in;
+ if (n > s->stream.avail_out) n = s->stream.avail_out;
+ if (n > 0) {
+- zmemcpy(s->stream.next_out, s->stream.next_in, n);
++ memcpy(s->stream.next_out, s->stream.next_in, n);
+ next_out += n;
+ s->stream.next_out = next_out;
+ s->stream.next_in += n;
diff --git a/gpac.spec b/gpac.spec
index a958826..31b424d 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 2.2.1
-Release: 5%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 6%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
License: LGPLv2+
URL: https://gpac.sourceforge.net/
Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz
@@ -25,6 +25,12 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta
Patch0: gpac-doxygen_195.patch
Patch1: https://github.com/gpac/gpac/commit/ba14e34dd7a3c4cef5a56962898e9f863dd4b...
+# zlib-ng doesn't define the zmemcpy macro anymore
+# https://github.com/gpac/gpac/pull/2780
+Patch2: gpac-no-zmemcpy.patch
+# cuvid device pointers are 64bit on aarch64 as well
+# https://github.com/gpac/gpac/pull/2781
+Patch3: gpac-aarch64-nvdec.patch
BuildRequires: SDL2-devel
BuildRequires: a52dec-devel
@@ -125,13 +131,7 @@ sed -i 's/dh_link/ln -s -r/' Makefile
--disable-oss-audio \
%{?_with_amr:--enable-amr} \
--enable-pic \
-%if 0%{?fedora} && 0%{?fedora} >= 40
- --use-zlib=no \
-%ifarch %{arm64}
- --disable-nvdec \
-%endif
-%endif
- --verbose
+ --verbose
#Avoid mess with setup.h
cp -p config.h include/gpac
@@ -200,6 +200,11 @@ rm %{buildroot}%{_includedir}/gpac/config.h
%changelog
+* Tue Mar 12 2024 Dominik Mierzejewski <dominik(a)greysector.net> - 2.2.1-6
+- re-enable zlib and nvdec
+- fix build with zlib-ng
+- fix building nvdec on aarch64
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
