From 62873e45a352b3e4cc3105049c178125897b3519 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 18:19:17 +0000 Subject: [PATCH 1/7] Adding Libdovi and AMD VCN support to this package. --- fr.handbrake.ghb.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index c061b66..dd0964a 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -63,7 +63,9 @@ "--flatpak", "--enable-qsv", "--enable-nvenc", - "--enable-nvdec" + "--enable-nvdec", + "--enable-vce", + "--enable-libdovi" ], "build-options": { "append-path": "/usr/lib/sdk/llvm16/bin", @@ -170,6 +172,20 @@ "type": "file", "dest": "download", "dest-filename": "nv-codec-headers-12.1.14.0.tar.gz" + }, + { + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdovi-3.2.0.tar.gz", + "sha256": "23c339b08bf32b66144b8fe17bf9a39f2dc810a37f081e5bc50207af9ae99922", + "type": "file", + "dest": "download", + "dest-filename": "libdovi-3.2.0.tar.gz" + }, + { + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz", + "sha256": "665bd83dc7facb407e9e32168e38f9a1e0f37cd3802f4409d3889a3bcaec908f", + "type": "file", + "dest": "download", + "dest-filename": "AMF-1.4.30-slim.tar.gz" } ], "modules": [], From 1702ec51e4463998a90e2230f11ab37850158412 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 18:20:11 +0000 Subject: [PATCH 2/7] Update README.markdown --- README.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index 6263e70..852cadd 100644 --- a/README.markdown +++ b/README.markdown @@ -8,15 +8,15 @@ All HandBrake development, including maintenance of Flatpak manifests, is perfor The manifest file `fr.handbrake.ghb.json` can be generated by HandBrake's build system after a release tag has been set and the release source package has been made available for download. The source package URL and SHA256 sum are required to generate the flatpak manifest. -E.g. to generate the flatpak manifest for HandBrake's 1.4.1 release +E.g. to generate the flatpak manifest for HandBrake's 1.7.3 release ``` git clone https://github.com/HandBrake/HandBrake.git cd HandBrake -git checkout 1.4.1 -./configure --flatpak --enable-qsv +git checkout 1.7.3 +./configure --flatpak --enable-qsv --enable-nvenc --enable-nvdec --enable-libdovi --enable-vce cd build make pkg.create.flathub \ - HB_URL=https://github.com/HandBrake/HandBrake/releases/download/1.4.1/HandBrake-1.4.1-source.tar.bz2 \ + HB_URL=https://github.com/HandBrake/HandBrake/releases/download/1.7.3/HandBrake-1.7.3-source.tar.bz2 \ HB_SHA256=39a0aecac8f26de1d88ccaca0a39dfca4af52029a792a78f93a42057a54c18f6 ``` From 32147ac8327feeac175dff741b3e1eae330f8679 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 18:35:12 +0000 Subject: [PATCH 3/7] Update fr.handbrake.ghb.json --- fr.handbrake.ghb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index dd0964a..5c2a5e6 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -178,7 +178,7 @@ "sha256": "23c339b08bf32b66144b8fe17bf9a39f2dc810a37f081e5bc50207af9ae99922", "type": "file", "dest": "download", - "dest-filename": "libdovi-3.2.0.tar.gz" + "dest-filename": "dovi_tool-libdovi-3.2.0.tar.gz" }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz", From def8f32d88022c3fd16636c7192d456fb9654dd6 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 19:37:27 +0000 Subject: [PATCH 4/7] Attempting to fix build --- fr.handbrake.ghb.json | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index 5c2a5e6..71987f2 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -64,11 +64,13 @@ "--enable-qsv", "--enable-nvenc", "--enable-nvdec", - "--enable-vce", "--enable-libdovi" ], "build-options": { - "append-path": "/usr/lib/sdk/llvm16/bin", + "append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin", + "build-args": [ + "--share=network" + ], "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib" }, "builddir": true, @@ -111,18 +113,18 @@ "dest-filename": "x265-snapshot-20230403-12776.tar.gz" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.3.0.tar.bz2", - "sha256": "bde8db3d0583a4f3733bb5a4ac525556ffd03ab7dcd8a6e7c091bee28d9466b1", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.4.0.tar.bz2", + "sha256": "7661648c95755db3d61857b3fdc427fa6d3271a573e84fd11c235441965e9397", "type": "file", "dest": "download", - "dest-filename": "dav1d-1.3.0.tar.bz2" + "dest-filename": "dav1d-1.4.0.tar.bz2" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.7.0.tar.gz", - "sha256": "ce0973584f1a187aa4abf63f509ff8464397120878e322a3153f87e9c161fc4f", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.8.0.tar.gz", + "sha256": "6b1f8a92f8f2767bf19144d5a2f42a0fcd90433a49311ad314f7e75bbb71dcb2", "type": "file", "dest": "download", - "dest-filename": "SVT-AV1-v1.7.0.tar.gz" + "dest-filename": "SVT-AV1-v1.8.0.tar.gz" }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.5.tar.gz", @@ -132,11 +134,11 @@ "dest-filename": "zimg-3.0.5.tar.gz" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-6.1.tar.bz2", - "sha256": "eb7da3de7dd3ce48a9946ab447a7346bd11a3a85e6efb8f2c2ce637e7f547611", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-6.1.1.tar.bz2", + "sha256": "5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20", "type": "file", "dest": "download", - "dest-filename": "ffmpeg-6.1.tar.bz2" + "dest-filename": "ffmpeg-6.1.1.tar.bz2" }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.3.tar.bz2", @@ -166,6 +168,13 @@ "dest": "download", "dest-filename": "oneVPL-2023.3.1.tar.gz" }, + { + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz", + "sha256": "665bd83dc7facb407e9e32168e38f9a1e0f37cd3802f4409d3889a3bcaec908f", + "type": "file", + "dest": "download", + "dest-filename": "AMF-1.4.30-slim.tar.gz" + }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-12.1.14.0.tar.gz", "sha256": "62b30ab37e4e9be0d0c5b37b8fee4b094e38e570984d56e1135a6b6c2c164c9f", @@ -179,13 +188,6 @@ "type": "file", "dest": "download", "dest-filename": "dovi_tool-libdovi-3.2.0.tar.gz" - }, - { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.30-slim.tar.gz", - "sha256": "665bd83dc7facb407e9e32168e38f9a1e0f37cd3802f4409d3889a3bcaec908f", - "type": "file", - "dest": "download", - "dest-filename": "AMF-1.4.30-slim.tar.gz" } ], "modules": [], @@ -201,6 +203,7 @@ } ], "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.llvm16" + "org.freedesktop.Sdk.Extension.llvm16", + "org.freedesktop.Sdk.Extension.rust-stable" ] } From c1e897000532c81e877f0a838ca348afc41e01c0 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 19:39:08 +0000 Subject: [PATCH 5/7] Update fr.handbrake.ghb.json --- fr.handbrake.ghb.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index 71987f2..8c21825 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -12,6 +12,7 @@ "--filesystem=host", "--filesystem=xdg-run/gvfs", "--filesystem=xdg-run/gvfsd", + "--filesystem=xdg-config/gtk-3.0", "--talk-name=org.gtk.vfs.*", "--system-talk-name=org.freedesktop.login1", "--system-talk-name=org.freedesktop.UPower", @@ -113,18 +114,18 @@ "dest-filename": "x265-snapshot-20230403-12776.tar.gz" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.4.0.tar.bz2", - "sha256": "7661648c95755db3d61857b3fdc427fa6d3271a573e84fd11c235441965e9397", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-1.3.0.tar.bz2", + "sha256": "bde8db3d0583a4f3733bb5a4ac525556ffd03ab7dcd8a6e7c091bee28d9466b1", "type": "file", "dest": "download", - "dest-filename": "dav1d-1.4.0.tar.bz2" + "dest-filename": "dav1d-1.3.0.tar.bz2" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.8.0.tar.gz", - "sha256": "6b1f8a92f8f2767bf19144d5a2f42a0fcd90433a49311ad314f7e75bbb71dcb2", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.7.0.tar.gz", + "sha256": "ce0973584f1a187aa4abf63f509ff8464397120878e322a3153f87e9c161fc4f", "type": "file", "dest": "download", - "dest-filename": "SVT-AV1-v1.8.0.tar.gz" + "dest-filename": "SVT-AV1-v1.7.0.tar.gz" }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.5.tar.gz", @@ -134,11 +135,11 @@ "dest-filename": "zimg-3.0.5.tar.gz" }, { - "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-6.1.1.tar.bz2", - "sha256": "5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20", + "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-6.1.tar.bz2", + "sha256": "eb7da3de7dd3ce48a9946ab447a7346bd11a3a85e6efb8f2c2ce637e7f547611", "type": "file", "dest": "download", - "dest-filename": "ffmpeg-6.1.1.tar.bz2" + "dest-filename": "ffmpeg-6.1.tar.bz2" }, { "url": "https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.3.tar.bz2", From 4bd13c66cd6acf9e21d681565fd2020802143426 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 19:48:25 +0000 Subject: [PATCH 6/7] Update fr.handbrake.ghb.json --- fr.handbrake.ghb.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index 8c21825..c2e95c7 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -69,9 +69,6 @@ ], "build-options": { "append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin", - "build-args": [ - "--share=network" - ], "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib" }, "builddir": true, From 043003e8e478c2aa211897407873a24b8d9637a2 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 29 Feb 2024 19:52:45 +0000 Subject: [PATCH 7/7] Update fr.handbrake.ghb.json --- fr.handbrake.ghb.json | 1 - 1 file changed, 1 deletion(-) diff --git a/fr.handbrake.ghb.json b/fr.handbrake.ghb.json index c2e95c7..a6eac26 100644 --- a/fr.handbrake.ghb.json +++ b/fr.handbrake.ghb.json @@ -12,7 +12,6 @@ "--filesystem=host", "--filesystem=xdg-run/gvfs", "--filesystem=xdg-run/gvfsd", - "--filesystem=xdg-config/gtk-3.0", "--talk-name=org.gtk.vfs.*", "--system-talk-name=org.freedesktop.login1", "--system-talk-name=org.freedesktop.UPower",