[acoustid-fingerprinter] add 07-qt5.patch
by Sérgio M. Basto
commit 2b08e065ee7129c9a40d316b3a54875b3148722f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 21 02:32:55 2022 +0000
add 07-qt5.patch
07-qt5.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
---
diff --git a/07-qt5.patch b/07-qt5.patch
new file mode 100644
index 0000000..dc24ea9
--- /dev/null
+++ b/07-qt5.patch
@@ -0,0 +1,55 @@
+From 3d893768131511e984ea47469c4c8fc9dc77e72f Mon Sep 17 00:00:00 2001
+From: Milkey Mouse <milkeymouse(a)meme.institute>
+Date: Fri, 1 Jan 2021 03:11:10 -0800
+Subject: [PATCH] Build on Qt 5
+
+---
+ CMakeLists.txt | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e47ec2a..23e04ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,12 +11,13 @@ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation
+
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
+-find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
++find_package(Qt5 COMPONENTS Core Gui Network Widgets REQUIRED)
+ find_package(FFmpeg REQUIRED)
+ find_package(Taglib REQUIRED)
+ find_package(Chromaprint REQUIRED)
+
+-include(${QT_USE_FILE})
++# HACK HACK HACK
++add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x000000 )
+
+ if(CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_BUILD_TYPE STREQUAL MinSizeRel OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+ add_definitions(-DQT_NO_DEBUG_OUTPUT)
+@@ -48,9 +49,10 @@ set(fpsubmit_SOURCES
+ #set(fpsubmit_UIS fpsubmit.ui)
+ set(fpsubmit_RESOURCES fingerprinter.qrc)
+
+-qt4_wrap_cpp(fpsubmit_MOC ${fpsubmit_HEADERS})
+-qt4_wrap_ui(fpsubmit_UIS_H ${fpsubmit_UIS})
+-qt4_add_resources(fpsubmit_RESOURCES_CPP ${fpsubmit_RESOURCES})
++set(CMAKE_AUTOMOC ON)
++set(CMAKE_AUTOUIC ON)
++set(CMAKE_AUTORCC ON)
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+ if(WIN32)
+ set(fpsubmit_SOURCES ${fpsubmit_SOURCES} fingerprinter.rc)
+@@ -111,7 +113,10 @@ set_target_properties(fpsubmit PROPERTIES
+ )
+
+ target_link_libraries(fpsubmit
+- ${QT_LIBRARIES}
++ Qt5::Core
++ Qt5::Gui
++ Qt5::Network
++ Qt5::Widgets
+ ${FFMPEG_LIBAVFORMAT_LIBRARIES}
+ ${FFMPEG_LIBAVCODEC_LIBRARIES}
+ ${FFMPEG_LIBAVUTIL_LIBRARIES}
1 year, 5 months
[acoustid-fingerprinter] Switch to Qt5
by Sérgio M. Basto
commit c19d490479f2be20c19497631e2c1477ca669f49
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 21 02:31:39 2022 +0000
Switch to Qt5
acoustid-fingerprinter.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/acoustid-fingerprinter.spec b/acoustid-fingerprinter.spec
index aa8c375..3d7540c 100644
--- a/acoustid-fingerprinter.spec
+++ b/acoustid-fingerprinter.spec
@@ -2,7 +2,7 @@
Name: acoustid-fingerprinter
Version: 0.6
-Release: 30%{?dist}
+Release: 31%{?dist}
Summary: Music AcoustID fingerprinting application
License: GPLv2+
@@ -15,10 +15,11 @@ Patch3: %{url}/commit/6cb95c67cd9699fb3d703451eb1c4bcabc96e25f.patch#/04
Patch4: %{url}/commit/632e87969c3a5562a5d4842b03613267ba6236b2.patch#/05-g++-6-char-cast.patch
Patch5: %{url}/commit/681ef059e4bdb0a9b1a073d6cbb9bb54e993fef9.patch#/06-taglib.patch
Patch6: compat-ffmpeg4.patch
+Patch7: %{url}/pull/16/commits/3d893768131511e984ea47469c4c8fc9dc77e72f.patch#/07-qt5.patch
BuildRequires: cmake
BuildRequires: ninja-build
-BuildRequires: qt4-devel
+BuildRequires: qt5-qtbase-devel
%if 0%{?fedora} && 0%{?fedora} > 35
BuildRequires: compat-ffmpeg4-devel
%else
@@ -62,13 +63,16 @@ install -p -D -m 0644 images/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/
%files
%doc CHANGES.txt
-%license COPYING.txt
+%license COPYING.txt
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%changelog
+* Mon Nov 21 2022 Sérgio Basto <sergio(a)serjux.com> - 0.6-31
+- Switch to Qt5
+
* Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.6-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
1 year, 5 months
[dvdstyler] update to 3.3 beta3 , use ffmpeg 5.x
by Sérgio M. Basto
commit 7bc91a803fc94952e17b2db664a0d19e565543f2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 21 01:52:20 2022 +0000
update to 3.3 beta3 , use ffmpeg 5.x
.gitignore | 1 +
dvdstyler.spec | 39 ++++++++++++++++-----------------------
fix.patch | 10 ----------
sources | 2 +-
4 files changed, 18 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68ac4ab..6d050e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ DVDStyler-2.9.6.tar.bz2
/DVDStyler-3.1.1.tar.bz2
/DVDStyler-3.1.2.tar.bz2
/DVDStyler-3.2.1.tar.bz2
+/DVDStyler-3.3b3.tar.bz2
diff --git a/dvdstyler.spec b/dvdstyler.spec
index 2a9740e..0d09a71 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -1,22 +1,22 @@
#For git snapshots, set to 0 to use release instead:
%global usesnapshot 0
%if 0%{?usesnapshot}
-%global commit0 1c9ce4ca75ca5819e50f0728beb0b65959821940
+%global commit0 656fd8386d0a7f555ecbd25a97d21557ada70cd2
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global snapshottag .git%{shortcommit0}
%endif
%global prerel_real .beta3
-%global prerel b2
-%global wxsvg_ver 1.5.23-2
+%global prerel b3
+%global wxsvg_ver 1.5.24
Name: dvdstyler
Epoch: 2
-Version: 3.2.1
+Version: 3.3
%if 0%{?usesnapshot}
-Release: 3%{?dist}
+Release: 0.2%{?prerel_real}%{?snapshottag}%{?dist}
%else
-Release: 3%{?dist}
+Release: 0.1%{?prerel_real}%{?dist}
%endif
Summary: Cross-platform DVD authoring application
License: GPLv2+
@@ -28,16 +28,15 @@ URL: http://www.dvdstyler.de/
# git clone https://git.code.sf.net/p/dvdstyler/DVDStyler dvdstyler
# cd dvdstyler
# git rev-parse --short HEAD
-# git archive --format=tar --prefix=dvdstyler/ %%{shortcommit0}
-# -o dvdstyler-%%{shortcommit0}.tar
+# git archive --format=tar --prefix=dvdstyler-%%{shortcommit0}/
+# -o ../dvdstyler-%%{shortcommit0}.tar HEAD
# bzip2 dvdstyler-%%{shortcommit0}.tar
%if 0%{?usesnapshot}
-Source0: %{name}-%{shortcommit0}.tar.bz2
+Source0: %{name}-%{shortcommit0}.zip
%else
-Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
%endif
-Patch1: fix.patch
# build
BuildRequires: automake
@@ -46,16 +45,12 @@ BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: byacc
# libraries
-BuildRequires: wxGTK-devel >= 3.1
+BuildRequires: wxGTK-devel >= 3.0
# wxsvg version with wxGTK3
BuildRequires: wxsvg-devel >= %{wxsvg_ver}
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg
-%if 0%{?fedora} && 0%{?fedora} > 35
-BuildRequires: compat-ffmpeg4-devel
-%else
BuildRequires: ffmpeg-devel
-%endif
# mpeg
BuildRequires: dvdauthor
# iso/burn
@@ -75,7 +70,6 @@ Requires: dvd+rw-tools
Requires: dvdauthor
Requires: mjpegtools
Requires: genisoimage
-# wxsvg version with wxGTK3
Requires: wxsvg >= %{wxsvg_ver}
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -88,20 +82,16 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%prep
%if 0%{?usesnapshot}
-%setup -q -n %{name}
+%autosetup -p1 -n dvdstyler-DVDStyler-%{commit0}
%else
-%setup -q -n DVDStyler-%{version}
+%autosetup -p1 -n DVDStyler-%{version}%{?prerel}
%endif
-%patch1 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
# fixes E: script-without-shebang
chmod a-x src/*.{h,cpp}
%build
-%if 0%{?fedora} && 0%{?fedora} > 35
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-%endif
rm -f install-sh depcomp missing mkinstalldirs compile config.guess config.sub install-sh
rm -f aclocal.m4 Makefile.in
#rm -f m4_ax_cxx_compile_stdcxx.m4 m4_ax_cxx_compile_stdcxx.m4 wxwin.m4
@@ -144,6 +134,9 @@ desktop-file-install \
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Mon Nov 21 2022 Sérgio Basto <sergio(a)serjux.com> - 2:3.3-0.1.beta3
+- update to 3.3 beta3 , use ffmpeg 5.x
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2:3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 23eca10..5ccfa01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (DVDStyler-3.2.1.tar.bz2) = 09124a6c8db2b8d8072bfe2f7de98474d736a36a66d5124eab1b925da9ca830901f554ca80d9a4403365616001d869237002a2cb467cf3cc11b37aea12ff9d90
+SHA512 (DVDStyler-3.3b3.tar.bz2) = 0df353fa9a3f3a5d4ef214590d50935958ef76258eac483160c815844375a5f96127a5d2574b7085d169a7b48108556f797e0b01665c649305caad10678d4cc5
1 year, 5 months
[ffmpeg/el7] Release 3.4.12
by Leigh Scott
commit f05de02a1090a16da84aaf7928c90c52b3b9be96
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 20 20:28:52 2022 +0000
Release 3.4.12
ffmpeg.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b953237..3a967be 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -66,7 +66,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.4.11
+Version: 3.4.12
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
@@ -401,6 +401,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Nov 20 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.12-1
+- Release 3.4.12
+
* Thu May 26 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.11-1
- Release 3.4.11
diff --git a/sources b/sources
index bbd4d02..67b8fed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-3.4.11.tar.xz) = 61d62d5ad7bbde78d957ca40b5cf9fae5fe0125292b99d0caff9441fad3ecea165a4546a44b9049849f588024c881bba2c6bbd0255133db49188d4bf4693ff4e
+SHA512 (ffmpeg-3.4.12.tar.xz) = d3a1b30ad168739a5994bc007304c3943afcf77a8d23870294265f44bbe335fe06beb096ed7763fc23669465a9bba690d810fbf955b15b35cf1f71557baceecd
1 year, 5 months
[ffmpeg/f36] Update to 5.0.2 release
by Leigh Scott
commit a926e4cf7e324a437d86d5603f8fd10e3d17f4b6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 20 20:24:01 2022 +0000
Update to 5.0.2 release
ffmpeg.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 055b7aa..28d22a8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -132,8 +132,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 5.0.1
-Release: 8%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Version: 5.0.2
+Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -514,6 +514,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Nov 20 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.2-1
+- Update to 5.0.2 release
+
* Mon Oct 17 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.1-8
- Disable rtmp because of rfbz: 6441 & 2399
diff --git a/sources b/sources
index 0194cdf..87f0b63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-5.0.1.tar.xz) = e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
+SHA512 (ffmpeg-5.0.2.tar.xz) = afabcd1c57fdad8d950cac81a85cd94120d6550149b1b365929205fc4c2e484f8e409accef107e800ecd9459b46d7b4e39132d7e3265d11f88001796f7afaa43
1 year, 5 months
[python-ffmpeg-normalize] Update python-ffmpeg-normalize to 1.25.3
by Sérgio M. Basto
commit 02dc4b2f4b8bc9d77aaa165b5dfab609186ff8a9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 20 18:58:24 2022 +0000
Update python-ffmpeg-normalize to 1.25.3
python-ffmpeg-normalize.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/python-ffmpeg-normalize.spec b/python-ffmpeg-normalize.spec
index c6b9a5d..e2b1e8a 100644
--- a/python-ffmpeg-normalize.spec
+++ b/python-ffmpeg-normalize.spec
@@ -2,7 +2,7 @@
%global pypi_name ffmpeg-normalize
Name: python-%{pypi_name}
-Version: 1.25.2
+Version: 1.25.3
Release: 1%{?dist}
Summary: Normalize audio via ffmpeg
@@ -62,6 +62,9 @@ Batch processing of several input files is possible, including video files.
%{python3_sitelib}/ffmpeg_normalize-%{version}-py%{python3_version}.egg-info
%changelog
+* Sun Nov 20 2022 Sérgio Basto <sergio(a)serjux.com> - 1.25.3-1
+- Update python-ffmpeg-normalize to 1.25.3
+
* Sat Sep 17 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.25.2-1
- Update to 1.25.2
diff --git a/sources b/sources
index a396981..2fcb230 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-normalize-1.25.2.tar.gz) = 2046c97d5d91f3d1ebb134d0c814a3d48eaaf34736fa5d46430bcfdd6bde801f48c62634a94d92be07ae5d40eaa65c847c176841298328fbec91f5ea2b20b4ca
+SHA512 (ffmpeg-normalize-1.25.3.tar.gz) = 869b5db78df80d933488f2c7c5e5271ce25f325c135fefb39682178c2dd2583f04a853d960a27ffde6f08c2b82c55eb01f7f8b2642378d1f299e0f318255fe30
1 year, 5 months