diff --git a/.gitignore b/.gitignore index 1f31b8d..7ef0e74 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gst-plugin-gtk4-0.11.0.crate /gst-plugin-gtk4-0.11.1.crate /gst-plugin-gtk4-0.11.3.crate +/gst-plugin-gtk4-0.12.3.crate diff --git a/gst-plugin-gtk4-fix-metadata-auto.diff b/gst-plugin-gtk4-fix-metadata-auto.diff index 6cbef32..9a34ec1 100644 --- a/gst-plugin-gtk4-fix-metadata-auto.diff +++ b/gst-plugin-gtk4-fix-metadata-auto.diff @@ -1,39 +1,39 @@ ---- gst-plugin-gtk4-0.11.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ gst-plugin-gtk4-0.11.3/Cargo.toml 2024-01-13T16:07:16.234369+00:00 -@@ -117,7 +117,6 @@ - "gst_gl_wayland", +--- gst-plugin-gtk4-0.12.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ gst-plugin-gtk4-0.12.3/Cargo.toml 2024-03-27T19:58:01.072895+00:00 +@@ -129,7 +129,6 @@ + "gst-gl-wayland", ] winegl = [ -- "gdk_win32/egl", - "gst_gl_egl", +- "gdk-win32/egl", + "gst-gl-egl", ] x11egl = [ -@@ -133,35 +132,3 @@ - "gst_gl_x11", +@@ -145,35 +144,3 @@ + "gst-gl-x11", ] --[target."cfg(target_os = \"macos\")".dependencies.gst_gl] --version = "0.21" +-[target."cfg(target_os = \"macos\")".dependencies.gst-gl] +-version = "0.22" -features = ["v1_16"] -package = "gstreamer-gl" - -[target."cfg(target_os = \"macos\")".dependencies.gtk] --version = "0.7" +-version = "0.8" -features = ["v4_6"] -package = "gtk4" - --[target."cfg(target_os = \"windows\")".dependencies.gdk_win32] --version = "0.7" +-[target."cfg(target_os = \"windows\")".dependencies.gdk-win32] +-version = "0.8" -features = ["v4_4"] -package = "gdk4-win32" - --[target."cfg(target_os = \"windows\")".dependencies.gst_gl] --version = "0.21" +-[target."cfg(target_os = \"windows\")".dependencies.gst-gl] +-version = "0.22" -features = ["v1_20"] -package = "gstreamer-gl" - -[target."cfg(target_os = \"windows\")".dependencies.gtk] --version = "0.7" +-version = "0.8" -features = ["v4_6"] -package = "gtk4" - diff --git a/gst-plugin-gtk4-fix-metadata.diff b/gst-plugin-gtk4-fix-metadata.diff index f8dc997..11df777 100644 --- a/gst-plugin-gtk4-fix-metadata.diff +++ b/gst-plugin-gtk4-fix-metadata.diff @@ -1,12 +1,12 @@ ---- gst-plugin-gtk4-0.11.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ gst-plugin-gtk4-0.11.3/Cargo.toml 2024-01-13T16:07:45.779502+00:00 -@@ -116,9 +116,6 @@ - "gst_gl", - "gst_gl_wayland", +--- gst-plugin-gtk4-0.12.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ gst-plugin-gtk4-0.12.3/Cargo.toml 2024-03-27T19:58:09.416933+00:00 +@@ -128,9 +128,6 @@ + "gst-gl", + "gst-gl-wayland", ] -winegl = [ -- "gst_gl_egl", +- "gst-gl-egl", -] x11egl = [ "gtk/v4_6", - "gdk_x11", + "gdk-x11", diff --git a/rust-gst-plugin-gtk4.spec b/rust-gst-plugin-gtk4.spec index 2d553f2..e7359b3 100644 --- a/rust-gst-plugin-gtk4.spec +++ b/rust-gst-plugin-gtk4.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global crate gst-plugin-gtk4 Name: rust-gst-plugin-gtk4 -Version: 0.11.3 +Version: 0.12.3 Release: %autorelease Summary: GStreamer GTK 4 Sink element and Paintable widget @@ -26,6 +26,7 @@ GStreamer GTK 4 Sink element and Paintable widget.} %package -n gstreamer1-plugin-gtk4 Summary: %{summary} + # Apache-2.0 OR MIT # MIT # MIT OR Apache-2.0 @@ -95,76 +96,112 @@ use the "doc" feature of the "%{crate}" crate. %files -n %{name}+doc-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gdk_wayland-devel +%package -n %{name}+gdk-wayland-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gdk-wayland-devel %{_description} + +This package contains library source intended for building other packages which +use the "gdk-wayland" feature of the "%{crate}" crate. + +%files -n %{name}+gdk-wayland-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gdk-x11-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gdk_wayland-devel %{_description} +%description -n %{name}+gdk-x11-devel %{_description} This package contains library source intended for building other packages which -use the "gdk_wayland" feature of the "%{crate}" crate. +use the "gdk-x11" feature of the "%{crate}" crate. -%files -n %{name}+gdk_wayland-devel +%files -n %{name}+gdk-x11-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gdk_x11-devel +%package -n %{name}+gst-gl-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gdk_x11-devel %{_description} +%description -n %{name}+gst-gl-devel %{_description} This package contains library source intended for building other packages which -use the "gdk_x11" feature of the "%{crate}" crate. +use the "gst-gl" feature of the "%{crate}" crate. -%files -n %{name}+gdk_x11-devel +%files -n %{name}+gst-gl-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gst_gl-devel +%package -n %{name}+gst-gl-egl-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gst_gl-devel %{_description} +%description -n %{name}+gst-gl-egl-devel %{_description} This package contains library source intended for building other packages which -use the "gst_gl" feature of the "%{crate}" crate. +use the "gst-gl-egl" feature of the "%{crate}" crate. -%files -n %{name}+gst_gl-devel +%files -n %{name}+gst-gl-egl-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gst_gl_egl-devel +%package -n %{name}+gst-gl-wayland-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gst_gl_egl-devel %{_description} +%description -n %{name}+gst-gl-wayland-devel %{_description} This package contains library source intended for building other packages which -use the "gst_gl_egl" feature of the "%{crate}" crate. +use the "gst-gl-wayland" feature of the "%{crate}" crate. -%files -n %{name}+gst_gl_egl-devel +%files -n %{name}+gst-gl-wayland-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gst_gl_wayland-devel +%package -n %{name}+gst-gl-x11-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gst_gl_wayland-devel %{_description} +%description -n %{name}+gst-gl-x11-devel %{_description} This package contains library source intended for building other packages which -use the "gst_gl_wayland" feature of the "%{crate}" crate. +use the "gst-gl-x11" feature of the "%{crate}" crate. -%files -n %{name}+gst_gl_wayland-devel +%files -n %{name}+gst-gl-x11-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gst_gl_x11-devel +%package -n %{name}+gtk_v4_10-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+gst_gl_x11-devel %{_description} +%description -n %{name}+gtk_v4_10-devel %{_description} This package contains library source intended for building other packages which -use the "gst_gl_x11" feature of the "%{crate}" crate. +use the "gtk_v4_10" feature of the "%{crate}" crate. -%files -n %{name}+gst_gl_x11-devel +%files -n %{name}+gtk_v4_10-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gtk_v4_12-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gtk_v4_12-devel %{_description} + +This package contains library source intended for building other packages which +use the "gtk_v4_12" feature of the "%{crate}" crate. + +%files -n %{name}+gtk_v4_12-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gtk_v4_14-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gtk_v4_14-devel %{_description} + +This package contains library source intended for building other packages which +use the "gtk_v4_14" feature of the "%{crate}" crate. + +%files -n %{name}+gtk_v4_14-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+static-devel @@ -221,14 +258,13 @@ use the "x11glx" feature of the "%{crate}" crate. %generate_buildrequires %cargo_generate_buildrequires -f wayland,x11egl,x11glx -echo 'cargo-c' +echo 'cargo-c >= 0.9.21' %build %cargo_build -f wayland,x11egl,x11glx -%cargo_cbuild -f wayland,x11egl,x11glx -# write license summary and breakdown %{cargo_license_summary -f wayland,x11egl,x11glx} %{cargo_license -f wayland,x11egl,x11glx} > LICENSE.dependencies +%cargo_cbuild -f wayland,x11egl,x11glx %install %cargo_install -f wayland,x11egl,x11glx diff --git a/rust2rpm.toml b/rust2rpm.toml index 79e8be9..3648dad 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,6 +1,23 @@ +[package] +bin-package-name = "gstreamer1-plugin-gtk4" +cargo-toml-patch-comments = ["drop Windows-specific \"winegl\" feature"] +extra-files = ["%{_libdir}/gstreamer-1.0/libgstgtk4.so"] + +[requires] +build = ["cargo-c >= 0.9.21"] + [features] enable = ["wayland", "x11egl", "x11glx"] -[requires] -build = ["cargo-c"] +[scripts] +build.post = [ + "%cargo_cbuild -f wayland,x11egl,x11glx", +] +install.post = [ + "%cargo_cinstall -f wayland,x11egl,x11glx", + "# remove statically linked library", + "rm -v %{buildroot}/%{_libdir}/gstreamer-1.0/libgstgtk4.a", + "# remove unnecessary pkgconfig file", + "rm -v %{buildroot}/%{_libdir}/pkgconfig/gstgtk4.pc", +] diff --git a/sources b/sources index 6b62cc6..3515302 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-plugin-gtk4-0.11.3.crate) = b44fc1dfa27e8b498ce3465b58a7ce81a3adad08142ed7a412cf122a40723417f4dea2ce73b0c217ffa4c29362039fbb57215047f778bf6e62296bb6006f4e09 +SHA512 (gst-plugin-gtk4-0.12.3.crate) = 355a46bb2869f33f36ddab5dfbc9c2214688ecc30ea6c4b7c0f3341e577e2316204fb136d5be3ee849ebe18b2209f21931cd3bccdd7aed7df6dabbeeaf1e3d66