[libndi/f41] Port to ffmpeg 7
by Mamoru Tasaka
Summary of changes:
08f4e45... Port to ffmpeg 7 (*)
(*) This commit already existed in another branch; no separate mail sent
1 week
[libndi] Port to ffmpeg 7
by Mamoru Tasaka
commit 08f4e45b69c614d870eb13b4bff779a7fdc41472
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Tue Dec 31 16:54:38 2024 +0900
Port to ffmpeg 7
libndi-c14b40c-ffmpeg7.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++
libndi.spec | 7 +++-
2 files changed, 82 insertions(+), 1 deletion(-)
---
diff --git a/libndi-c14b40c-ffmpeg7.patch b/libndi-c14b40c-ffmpeg7.patch
new file mode 100644
index 0000000..2ff5dcd
--- /dev/null
+++ b/libndi-c14b40c-ffmpeg7.patch
@@ -0,0 +1,76 @@
+diff --git a/libndi.c b/libndi.c
+index 1edecbf..d01e9f8 100644
+--- a/libndi.c
++++ b/libndi.c
+@@ -68,7 +68,7 @@ typedef struct ndi_message
+ struct ndi_ctx
+ {
+ /* buffers */
+- AVFifoBuffer *fifo;
++ AVFifo *fifo;
+
+ int target_size;
+
+@@ -378,7 +378,7 @@ static int handle_ndi_packet(ndi_ctx *ndi_ctx)
+ {
+ if(!ndi_ctx->target_size) {
+ uint8_t data[12];
+- av_fifo_generic_peek(ndi_ctx->fifo, data, 12, NULL); // fixme
++ av_fifo_peek(ndi_ctx->fifo, data, 0, 12); // fixme
+
+ /* MSB = scrambled bit */
+ uint16_t header_type = data[0] | (data[1] << 8);
+@@ -394,17 +394,17 @@ static int handle_ndi_packet(ndi_ctx *ndi_ctx)
+ }
+
+ //printf("target size %i \n", ndi_ctx->target_size);
+- if(av_fifo_space(ndi_ctx->fifo) < ndi_ctx->target_size)
+- av_fifo_grow(ndi_ctx->fifo, ndi_ctx->target_size * 3 / 2);
++ if(av_fifo_can_write(ndi_ctx->fifo) < ndi_ctx->target_size)
++ av_fifo_grow2(ndi_ctx->fifo, ndi_ctx->target_size * 3 / 2);
+ }
+
+- if(av_fifo_size(ndi_ctx->fifo) >= ndi_ctx->target_size) {
++ if(av_fifo_can_read(ndi_ctx->fifo) >= ndi_ctx->target_size) {
+ /* FIXME: make this zero copy */
+ uint8_t *data = malloc(ndi_ctx->target_size);
+ if(!data)
+ return -1;
+
+- av_fifo_generic_read(ndi_ctx->fifo, data, ndi_ctx->target_size, NULL);
++ av_fifo_read(ndi_ctx->fifo, data, ndi_ctx->target_size);
+ process_ndi_packet(ndi_ctx, data, ndi_ctx->target_size);
+ //printf("draining %i \n", ndi_ctx->target_size);
+ free(data);
+@@ -426,10 +426,10 @@ static int receive_ndi_packet(ndi_ctx *ndi_ctx)
+ if(len == 0)
+ printf("end \n");
+
+- if(av_fifo_space(ndi_ctx->fifo) < len)
+- av_fifo_grow(ndi_ctx->fifo, 5000); // fixme
++ if(av_fifo_can_write(ndi_ctx->fifo) < len)
++ av_fifo_grow2(ndi_ctx->fifo, 5000); // fixme
+
+- av_fifo_generic_write(ndi_ctx->fifo, tmp, len, NULL);
++ av_fifo_write(ndi_ctx->fifo, tmp, len);
+
+ if(handle_ndi_packet(ndi_ctx) < 0) {
+ printf("handle fail \n");
+@@ -462,7 +462,7 @@ ndi_ctx *libndi_init(void)
+ return NULL;
+ }
+
+- ndi_ctx->fifo = av_fifo_alloc(10000);
++ ndi_ctx->fifo = av_fifo_alloc2(10000, 1, 0);
+ if(!ndi_ctx->fifo)
+ goto end;
+
+@@ -629,7 +629,7 @@ void libndi_close(ndi_ctx *ndi_ctx)
+ for(int i = 0; i < 4; i++)
+ free(ndi_ctx->ndi_request[i].buf);
+
+- av_fifo_free(ndi_ctx->fifo);
++ av_fifo_freep2(&ndi_ctx->fifo);
+
+ free(ndi_ctx);
+ }
diff --git a/libndi.spec b/libndi.spec
index 3b85e4a..0512a5e 100644
--- a/libndi.spec
+++ b/libndi.spec
@@ -3,12 +3,14 @@
Name: libndi
Version: 0.0.1
-Release: 12.git%{?shortcommit0}%{?dist}
+Release: 13.git%{?shortcommit0}%{?dist}
Summary: Open-source library done to interact with NDI streams
License: LGPLv2+
URL: https://code.videolan.org/jbk/libndi
Source0: %{url}/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+# Port to ffmpeg 7
+Patch0: libndi-c14b40c-ffmpeg7.patch
BuildRequires: gcc
BuildRequires: meson
@@ -71,6 +73,9 @@ The %{name}-utils package contains utilities for %{name}.
%changelog
+* Tue Dec 31 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.0.1-13.gitc14b40c
+- Port to ffmpeg 7
+
* Wed Nov 06 2024 Sérgio Basto <sergio(a)serjux.com> - 0.0.1-12.gitc14b40c
- Rebuild for ffmeg-7
1 week
[mixxx/f40] (8 commits) ...New upstream release 2.5.0 - fix dependencies
by Luís Correia
Summary of changes:
e5cf2b1... use tar.gz source instead of zip for libkeyfinder (*)
20881c1... Revert "use tar.gz source instead of zip for libkeyfinder" (*)
923cf18... Test removing some packages (*)
f25641b... Fully remove ffmpeg from build (*)
850d1f0... New upstream release 2.5.0 (*)
dc5e2de... New upstream release 2.5.0, fix dependencies (*)
bf7a592... New upstream release 2.5.0 - fixed dependencies (*)
57bfba6... New upstream release 2.5.0 - fix dependencies (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 1 day
[mixxx: 3/3] New upstream release 2.5.0 - fix dependencies
by Luís Correia
commit 57bfba6045d156beb7dcf60406bd70df4657c263
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Sun Dec 29 14:17:00 2024 +0000
New upstream release 2.5.0 - fix dependencies
mixxx.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 5e668ce..7a5e6e0 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -82,9 +82,8 @@ BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qt5compat-devel
BuildRequires: qt6-qtshadertools-devel
BuildRequires: qt6-qtdeclarative-devel
-#BuildRequires: qt6-qtscript-devel
BuildRequires: qt6-qtsvg-devel
-#BuildRequires: qt6-qtx11extras-devel
+BuildRequires: qt6-qtbase-private-devel
BuildRequires: qtkeychain-qt6-devel
BuildRequires: rubberband-devel
BuildRequires: soundtouch-devel
1 week, 1 day
[mixxx] (3 commits) ...New upstream release 2.5.0 - fix dependencies
by Luís Correia
Summary of changes:
dc5e2de... New upstream release 2.5.0, fix dependencies (*)
bf7a592... New upstream release 2.5.0 - fixed dependencies (*)
57bfba6... New upstream release 2.5.0 - fix dependencies
(*) This commit already existed in another branch; no separate mail sent
1 week, 1 day
[mixxx/f41] New upstream release 2.5.0 - fixed dependencies
by Luís Correia
commit bf7a59220f4478db370105b58f8c0f972b5c332a
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Sun Dec 29 12:28:36 2024 +0000
New upstream release 2.5.0 - fixed dependencies
mixxx.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 3294bdc..5e668ce 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -28,7 +28,7 @@
Name: mixxx
Version: 2.5.0
-Release: 1%{?dist}
+Release: 0%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -79,6 +79,8 @@ BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: protobuf-lite-devel
BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qt5compat-devel
+BuildRequires: qt6-qtshadertools-devel
BuildRequires: qt6-qtdeclarative-devel
#BuildRequires: qt6-qtscript-devel
BuildRequires: qt6-qtsvg-devel
@@ -168,7 +170,8 @@ desktop-file-install \
rm -rf \
%{buildroot}%{_prefix}%{_sysconfdir}/ \
%{buildroot}%{_datadir}/doc/ \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}_macos.svg
+ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}_macos.svg \
+ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}_ios.svg
%check
1 week, 1 day
[cairo-dock-freeworld] Update to the latest git (20241218gitf852640)
by Mamoru Tasaka
commit 9ea5ed8dc50698c2c873ae4cd6b8c912b7e4121b
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sun Dec 29 15:32:34 2024 +0900
Update to the latest git (20241218gitf852640)
cairo-dock-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cairo-dock-freeworld.spec b/cairo-dock-freeworld.spec
index 5d81262..7fe379e 100644
--- a/cairo-dock-freeworld.spec
+++ b/cairo-dock-freeworld.spec
@@ -4,8 +4,8 @@
%global plugin_least_ver 3.5.99
%global use_git 1
-%global gitdate 20241216
-%global githash 4f36d13797c2ca508376c15d462cf644e71f69fb
+%global gitdate 20241218
+%global githash f8526402586820d05eefa18d4c8ca5e6d017c5e7
%global shorthash %(c=%{githash} ; echo ${c:0:7})
%global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
@@ -186,6 +186,9 @@ install -cpm 644 \
%{_libdir}/%{name}/libgldi.so.3*
%changelog
+* Sun Dec 29 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.5.99^20241218gitf852640-1.beta6
+- Update to the latest git (20241218gitf852640)
+
* Mon Dec 16 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.5.99^20241216git4f36d13-1.beta6
- Update to the latest git (20241216git4f36d13)
diff --git a/sources b/sources
index 2ef8e51..2b956d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cairo-dock-3.5.99-20241216git4f36d13.tar.gz) = d2f5a2c82b0d8511651aacc34f29c308a08bacf685911335c94180fce2aaa232da180624221eccb9acabf593a933103b23faba830eada2f1b27cbc6a27191aed
+SHA512 (cairo-dock-3.5.99-20241218gitf852640.tar.gz) = f8143cb0665f8951c2c52ec4e7dde1415065ed800478303f654b2eb95b0718042bb15eecc996ee8b9bcb7bea79a4cf05ed2615bcf2e123190bd5b1317c56cbdd
1 week, 2 days
[mixxx/f41] New upstream release 2.5.0, fix dependencies
by Luís Correia
commit dc5e2de0ba6ad32ad54f36083cb80906c0b44d4c
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Sat Dec 28 21:19:29 2024 +0000
New upstream release 2.5.0, fix dependencies
mixxx.spec | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index a5774d4..3294bdc 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -28,7 +28,7 @@
Name: mixxx
Version: 2.5.0
-Release: 0%{?dist}
+Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -78,12 +78,12 @@ BuildRequires: opusfile-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: protobuf-lite-devel
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtdeclarative-devel
-BuildRequires: qt5-qtscript-devel
-BuildRequires: qt5-qtsvg-devel
-BuildRequires: qt5-qtx11extras-devel
-BuildRequires: qtkeychain-qt5-devel
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qtdeclarative-devel
+#BuildRequires: qt6-qtscript-devel
+BuildRequires: qt6-qtsvg-devel
+#BuildRequires: qt6-qtx11extras-devel
+BuildRequires: qtkeychain-qt6-devel
BuildRequires: rubberband-devel
BuildRequires: soundtouch-devel
BuildRequires: sqlite-devel
@@ -95,7 +95,7 @@ BuildRequires: zlib-devel
# Runtime Requirements
#Requires: faad2
Requires: open-sans-fonts
-Requires: qt5-qttranslations
+Requires: qt6-qttranslations
%description
Mixxx is open source software for DJ'ing. You can use
@@ -222,6 +222,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Sat Dec 28 2024 Luís Correia <luis.f.correia(a)gmail.com> - 2.5.0-1
+- New upstream release 2.5.0, fix dependencies
+
* Sat Dec 28 2024 Luís Correia <luis.f.correia(a)gmail.com> - 2.5.0-0
- New upstream release 2.5.0
1 week, 2 days