From 1c08867f4db78a0fd34f6a166b773d931659ab9b Mon Sep 17 00:00:00 2001 From: Hershel Date: Mon, 17 Nov 2025 08:03:08 +0000 Subject: [PATCH 1/6] =?UTF-8?q?update=20OpenSceneGraph.spec.=20#=20BuildRe?= =?UTF-8?q?quires:=20liblas-devel=20#=20BuildRequires:=20pkgconfig(gtkglex?= =?UTF-8?q?t-x11-1.0)=20#=20BuildRequires:=20pkgconfig(collada-dom)?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hershel --- OpenSceneGraph.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index 5cb87e7..1b48836 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -39,7 +39,7 @@ BuildRequires: libcurl-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libjpeg-devel -BuildRequires: liblas-devel +#BuildRequires: liblas-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libvncserver-devel @@ -51,7 +51,7 @@ BuildRequires: openal-soft-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gta) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gtkglext-x11-1.0) +#BuildRequires: pkgconfig(gtkglext-x11-1.0) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(librsvg-2.0) >= 2.35 BuildRequires: pkgconfig(xrandr) @@ -63,7 +63,7 @@ BuildRequires: SDL2-devel BuildRequires: SDL-devel %{?with_OpenEXR:BuildRequires: cmake(OpenEXR)} -%{?with_Collada:BuildRequires: pkgconfig(collada-dom)} +#%{?with_Collada:BuildRequires: pkgconfig(collada-dom)} %{?with_jasper:BuildRequires: jasper-devel} %{?with_gstreamer:BuildRequires: pkgconfig(gstreamer-1.0)} %{?with_gstreamer:BuildRequires: pkgconfig(gstreamer-base-1.0)} -- Gitee From 5f2b63bc0cb7b9e5ec2ba1e46feb6952807f24a0 Mon Sep 17 00:00:00 2001 From: Hershel Date: Mon, 17 Nov 2025 12:14:24 +0000 Subject: [PATCH 2/6] update OpenSceneGraph.spec. Signed-off-by: Hershel --- OpenSceneGraph.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index 1b48836..25e80a7 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -5,6 +5,8 @@ %bcond_without jasper %bcond_without OpenEXR %bcond_without Collada +%bcond_without las +%bcond_without gtkglext %bcond_with wxWidgets %bcond_with mingw @@ -39,7 +41,9 @@ BuildRequires: libcurl-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libjpeg-devel +%if %{with las} #BuildRequires: liblas-devel +%endif BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libvncserver-devel @@ -51,7 +55,9 @@ BuildRequires: openal-soft-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gta) BuildRequires: pkgconfig(gtk+-2.0) +%if %{with gtkglext} #BuildRequires: pkgconfig(gtkglext-x11-1.0) +%endif BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(librsvg-2.0) >= 2.35 BuildRequires: pkgconfig(xrandr) @@ -63,7 +69,9 @@ BuildRequires: SDL2-devel BuildRequires: SDL-devel %{?with_OpenEXR:BuildRequires: cmake(OpenEXR)} +%if %{with collada} #%{?with_Collada:BuildRequires: pkgconfig(collada-dom)} +%endif %{?with_jasper:BuildRequires: jasper-devel} %{?with_gstreamer:BuildRequires: pkgconfig(gstreamer-1.0)} %{?with_gstreamer:BuildRequires: pkgconfig(gstreamer-base-1.0)} @@ -339,7 +347,9 @@ mkdir -p %{buildroot}%{_datadir}/OpenSceneGraph %{?with_jasper:%{_libdir}/osgPlugins-%{version}/osgdb_jp2.so} %{_libdir}/osgPlugins-%{version}/osgdb_jpeg.so %{_libdir}/osgPlugins-%{version}/osgdb_ktx.so +%if %{with las} %{_libdir}/osgPlugins-%{version}/osgdb_las.so +%endif %{_libdir}/osgPlugins-%{version}/osgdb_logo.so %{_libdir}/osgPlugins-%{version}/osgdb_lua.so %{_libdir}/osgPlugins-%{version}/osgdb_lwo.so -- Gitee From 1a17da2201932b17414c0d55cb1bc402844b4a6e Mon Sep 17 00:00:00 2001 From: Hershel Date: Tue, 18 Nov 2025 09:19:41 +0000 Subject: [PATCH 3/6] update OpenSceneGraph.spec. Signed-off-by: Hershel --- OpenSceneGraph.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index 25e80a7..1ab91a7 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -5,7 +5,7 @@ %bcond_without jasper %bcond_without OpenEXR %bcond_without Collada -%bcond_without las +%bcond_with las %bcond_without gtkglext %bcond_with wxWidgets %bcond_with mingw -- Gitee From 9adf23c4d1dce7441cd3580f39fd6dd928dc03c8 Mon Sep 17 00:00:00 2001 From: Hershel Date: Wed, 19 Nov 2025 07:31:22 +0000 Subject: [PATCH 4/6] update OpenSceneGraph.spec. Signed-off-by: Hershel --- OpenSceneGraph.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index 1ab91a7..ba343e4 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -4,7 +4,7 @@ %bcond_with Coin4 %bcond_without jasper %bcond_without OpenEXR -%bcond_without Collada +%bcond_with Collada %bcond_with las %bcond_without gtkglext %bcond_with wxWidgets -- Gitee From b32aaa9a6198c69a83d20d50297ad7b7ec21efef Mon Sep 17 00:00:00 2001 From: Hershel Date: Mon, 24 Nov 2025 05:43:48 +0000 Subject: [PATCH 5/6] update OpenSceneGraph.spec. Signed-off-by: Hershel --- OpenSceneGraph.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index ba343e4..b6adad7 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -6,7 +6,7 @@ %bcond_without OpenEXR %bcond_with Collada %bcond_with las -%bcond_without gtkglext +%bcond_with gtkglext %bcond_with wxWidgets %bcond_with mingw -- Gitee From e7297dbd85830d7516e8e79e5472f685ee1046ed Mon Sep 17 00:00:00 2001 From: Hershel Date: Mon, 24 Nov 2025 05:45:31 +0000 Subject: [PATCH 6/6] update OpenSceneGraph.spec. Signed-off-by: Hershel --- OpenSceneGraph.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index b6adad7..41beee2 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -680,7 +680,9 @@ mkdir -p %{buildroot}%{_datadir}/OpenSceneGraph %{_bindir}/osgviewerFLTK %files examples-gtk +%if %{with gtkglext} %{_bindir}/osgviewerGTK +%endif %files -n OpenThreads %doc AUTHORS.txt NEWS.txt README.md -- Gitee