[gpac] Apply patch
by Leigh Scott
commit 8c43f8fee9e1380348fc46f563f47871f52f76ff
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 28 15:45:09 2023 +0000
Apply patch
ffmpeg6.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
gpac.spec | 1 +
2 files changed, 43 insertions(+)
---
diff --git a/ffmpeg6.patch b/ffmpeg6.patch
new file mode 100644
index 0000000..91f298a
--- /dev/null
+++ b/ffmpeg6.patch
@@ -0,0 +1,42 @@
+diff -uNrp a/src/filters/ff_common.h b/src/filters/ff_common.h
+--- a/src/filters/ff_common.h 2022-12-19 16:03:06.000000000 +0000
++++ b/src/filters/ff_common.h 2023-02-28 15:41:54.481172893 +0000
+@@ -46,7 +46,7 @@
+ #define FF_FREE_PCK(_pkt) av_free_packet(_pkt);
+ #define FF_RELEASE_PCK(_pkt)
+ #define FF_INIT_PCK(ctx, _pkt) { pkt = &ctx->pkt; av_init_packet(pkt); }
+-#define FF_OFMT_CAST (AVOutputFormat *)
++#define FF_OFMT_CAST (FFOutputFormat *)
+ #define FF_IFMT_CAST (AVInputFormat *)
+ #else
+ #define FF_FREE_PCK(_pkt) av_packet_unref(_pkt);
+diff -uNrp a/src/filters/ff_mx.c b/src/filters/ff_mx.c
+--- a/src/filters/ff_mx.c 2022-12-19 16:03:06.000000000 +0000
++++ b/src/filters/ff_mx.c 2023-02-28 15:42:44.758941007 +0000
+@@ -229,7 +229,7 @@ static GF_Err ffmx_open_url(GF_FFMuxCtx
+ {
+ const char *dst;
+ Bool use_gfio=GF_FALSE;
+- const AVOutputFormat *ofmt = ctx->muxer->oformat;
++ const FFOutputFormat *ofmt = ctx->muxer->oformat;
+
+ dst = final_name ? final_name : ctx->dst;
+ if (!strncmp(dst, "gfio://", 7)) {
+@@ -280,7 +280,7 @@ static GF_Err ffmx_open_url(GF_FFMuxCtx
+ static GF_Err ffmx_initialize_ex(GF_Filter *filter, Bool use_templates)
+ {
+ const char *url, *sep;
+- const AVOutputFormat *ofmt;
++ const FFOutputFormat *ofmt;
+ GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
+
+ if (!ctx->dst) return GF_BAD_PARAM;
+@@ -1358,7 +1358,7 @@ static GF_FilterProbeScore ffmx_probe_ur
+ return GF_FPROBE_NOT_SUPPORTED;
+
+
+- const AVOutputFormat *ofmt = av_guess_format(NULL, url, mime);
++ const FFOutputFormat *ofmt = av_guess_format(NULL, url, mime);
+ if (!ofmt && mime) ofmt = av_guess_format(NULL, NULL, mime);
+ if (!ofmt && url) ofmt = av_guess_format(NULL, url, NULL);
+
diff --git a/gpac.spec b/gpac.spec
index 04ffb87..abd8a03 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -25,6 +25,7 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta
Patch0: gpac-doxygen_195.patch
Patch1: Revert-revert-ffmx-gfio.patch
+Patch2: ffmpeg6.patch
BuildRequires: SDL2-devel
BuildRequires: a52dec-devel
1 year, 1 month
[x264] Disable build with gpac until we can build gapc with ffmepg-6
by Sérgio M. Basto
commit 6b54871f39f845ff7fc7b1335944a77080bb3857
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Feb 28 15:41:46 2023 +0000
Disable build with gpac until we can build gapc with ffmepg-6
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index e9ceb46..9172e87 100644
--- a/x264.spec
+++ b/x264.spec
@@ -15,10 +15,10 @@
%global _without_libswscale 1
}
+%global _without_gpac 1
# Reduce dependencies to build x264-libs on i686
%if 0%{?fedora}
%ifarch i686
-%global _without_gpac 1
%global _without_libavformat 1
%global _without_libswscale 1
%endif
@@ -33,7 +33,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -178,6 +178,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Tue Feb 28 2023 Sérgio Basto <sergio(a)serjux.com> - 0.164-6.20220602gitbaee400f
+- Disable build with gpac until we can build gapc with ffmepg-6
+
* Tue Feb 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 0.164-5.20220602gitbaee400f
- Rebuilt for new ffmpeg
1 year, 1 month
[gpac] Apply patch
by Leigh Scott
commit 7792ef59352472cfdcfebc1fb2c0008a7882ae75
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 28 15:24:04 2023 +0000
Apply patch
Revert-revert-ffmx-gfio.patch | 26 ++++++++++++++++++++++++++
gpac.spec | 1 +
2 files changed, 27 insertions(+)
---
diff --git a/Revert-revert-ffmx-gfio.patch b/Revert-revert-ffmx-gfio.patch
new file mode 100644
index 0000000..4bdc4e1
--- /dev/null
+++ b/Revert-revert-ffmx-gfio.patch
@@ -0,0 +1,26 @@
+From 5d6f6d42833de953c4831ea974afed82cffa4e0c Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Tue, 28 Feb 2023 13:46:30 +0000
+Subject: [PATCH] Revert "revert ffmx gfio patch"
+
+This reverts commit 70bc8f6877a9651a0fc4c1b14e8cd2bf2f07a068.
+---
+ src/filters/ff_mx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/filters/ff_mx.c b/src/filters/ff_mx.c
+index 34e5f59e7..96d290177 100644
+--- a/src/filters/ff_mx.c
++++ b/src/filters/ff_mx.c
+@@ -503,7 +503,7 @@ static GF_Err ffmx_close_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, Bool send_evt_
+ evt.seg_size.is_init = 0;
+ }
+ evt.seg_size.media_range_start = ctx->offset_at_seg_start;
+- evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0;
++ evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0;
+ ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+
+ gf_filter_pid_send_event(pid, &evt);
+--
+2.39.2
+
diff --git a/gpac.spec b/gpac.spec
index 6a6a71c..04ffb87 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -24,6 +24,7 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta
#Source0: https://github.com/gpac/gpac/archive/%{commit}/gpac-%{commit}.tar.gz
Patch0: gpac-doxygen_195.patch
+Patch1: Revert-revert-ffmx-gfio.patch
BuildRequires: SDL2-devel
BuildRequires: a52dec-devel
1 year, 1 month
[megasync/f36] Update to 4.8.8.0.
by Vasiliy Glazov
Summary of changes:
9d9d002... Update to 4.8.8.0. (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 1 month
[megasync/f37] Update to 4.8.8.0.
by Vasiliy Glazov
Summary of changes:
9d9d002... Update to 4.8.8.0. (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 1 month
[megasync/f38] Update to 4.8.8.0.
by Vasiliy Glazov
Summary of changes:
9d9d002... Update to 4.8.8.0. (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 1 month
[megasync] Update to 4.8.8.0.
by Vasiliy Glazov
commit 9d9d002117a8842c2480cc0b93fa05810835c9fe
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Tue Feb 28 13:57:09 2023 +0300
Update to 4.8.8.0.
.gitignore | 2 ++
megasync.spec | 7 +++++--
sources | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95765fe..2d4c9d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@
/v4.9.0b.tar.gz
/v4.8.6.0_OSX.tar.gz
/v4.8.7.0_OSX.tar.gz
+/v4.8.8.0_OSX.tar.gz
+/v4.14.0.tar.gz
diff --git a/megasync.spec b/megasync.spec
index dbcd198..0a96662 100644
--- a/megasync.spec
+++ b/megasync.spec
@@ -1,4 +1,4 @@
-%global sdk_version 4.9.0b
+%global sdk_version 4.14.0
%global source_suffix OSX
%bcond_without dolphin
@@ -14,7 +14,7 @@
%endif
Name: megasync
-Version: 4.8.7.0
+Version: 4.8.8.0
Release: 1%{?dist}
Summary: Easy automated syncing between your computers and your MEGA cloud drive
# MEGAsync is under a proprietary license, except the SDK which is BSD
@@ -261,6 +261,9 @@ popd
%endif
%changelog
+* Tue Feb 28 2023 Vasiliy Glazov <vascom2(a)gmail.com> - 4.8.8.0-1
+- Update to 4.8.8.0
+
* Sat Feb 04 2023 Vasiliy Glazov <vascom2(a)gmail.com> - 4.8.7.0-1
- Update to 4.8.7.0
diff --git a/sources b/sources
index 792ac95..5343200 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v4.8.7.0_OSX.tar.gz) = c157bad77fbd2bccf0b7d2d1e5d62740848c478c9219f2e8f74c16bc6e26f95cf45ed65ee4ba77eb790501b3d8d4657c78a731cbcad6209603d85bc9e8e695ed
-SHA512 (v4.9.0b.tar.gz) = 97c371081e333437bcb265ab2c16ad2bde1e1b6dc55cf397dabf32fa1c47b250e48f5d4309c6e2762ad929bf89ce80b8d597575956812513733f01aacf2288fc
+SHA512 (v4.8.8.0_OSX.tar.gz) = 1796b32bb1e3c1a3d65ba9caf5dfe32c05dcd982af8ea117f2878c9fd44d4636fd67ef3976920887524e09c1ccb2753b5efa4d5228c7a00aac83bc722e916de1
+SHA512 (v4.14.0.tar.gz) = fb2f10ff391bc45d115f05497caeb75a628485ed3d48ccc388d522d52838dfcaabedda8925c970c15896c0646ffa0c135f99d4525aee39e845b0921e49bac9fb
1 year, 1 month
[gpac] Rebuilt for new ffmpeg
by Leigh Scott
commit 1119ff29ef72d7e1e07912a8f4b7a07c09982b46
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 28 08:33:53 2023 +0000
Rebuilt for new ffmpeg
gpac.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gpac.spec b/gpac.spec
index 396beed..6a6a71c 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 2.2.0
-Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 2%{?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
@@ -193,6 +193,9 @@ rm %{buildroot}%{_includedir}/gpac/config.h
%changelog
+* Tue Feb 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 2.2.0-2
+- Rebuilt for new ffmpeg
+
* Sat Feb 18 2023 Leigh Scott <leigh123linux(a)gmail.com> - 2.2.0-1
- Update to 2.2.0
1 year, 1 month
[ffmpeg] Disable chromaprint
by Leigh Scott
commit 4bccdb8ab5a77942930530ab69d19ce48efc6b26
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 28 07:24:09 2023 +0000
Disable chromaprint
ffmpeg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4ed702c..3654bab 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -28,7 +28,7 @@
%endif
%ifnarch i686
%global _with_bs2b 1
-%global _with_chromaprint 1
+#global _with_chromaprint 1
%global _with_ilbc 1
%global _with_rav1e 1
%global _with_rubberband 1
@@ -43,7 +43,6 @@
%global _without_vulkan 1
%endif
%ifarch x86_64
-#global _with_mfx 1
%global _with_vpl 1
%global _with_svtav1 1
%global _with_vapoursynth 1
@@ -112,7 +111,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.0
-Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -523,6 +522,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Tue Feb 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-2
+- Disable chromaprint
+
* Tue Feb 21 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-1
- Update to 6.0 release
1 year, 1 month
[x264] Rebuilt for new ffmpeg
by Leigh Scott
commit df0cdb3dfbb631533e1179c50771503fe8411ddf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 28 07:15:31 2023 +0000
Rebuilt for new ffmpeg
x264.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index 7beae6b..e9ceb46 100644
--- a/x264.spec
+++ b/x264.spec
@@ -33,7 +33,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -178,6 +178,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Tue Feb 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 0.164-5.20220602gitbaee400f
+- Rebuilt for new ffmpeg
+
* Sun Feb 19 2023 Leigh Scott <leigh123linux(a)gmail.com> - 0.164-4.20220602gitbaee400f
- rebuilt
1 year, 1 month