Skip to content

Commit a0cf26e

Browse files
author
Rye
committed
Fix VLC plugin build on linux
Clean up dead autobuild packages dbus_glib fontconfig gstreamer libuuid and related build system portions Fix call to cmake with CMAKE_COMMAND
1 parent 2a7da38 commit a0cf26e

18 files changed

+46
-295
lines changed

‎.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
libgl1-mesa-dev libglu1-mesa-dev libxinerama-dev \
138138
libxcursor-dev libxfixes-dev libgstreamer1.0-dev \
139139
libgstreamer-plugins-base1.0-dev ninja-build libxft-dev \
140-
llvm mold libpipewire-0.3-dev libdbus-1-dev
140+
llvm mold libpipewire-0.3-dev libdbus-1-dev libvlc-dev
141141
sudo locale-gen en_US.UTF-8
142142
sudo locale-gen en_GB.UTF-8
143143
sudo locale-gen fr_FR.UTF-8

‎autobuild.xml

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -409,36 +409,6 @@
409409
<key>description</key>
410410
<string>Library for transferring data specified with URL syntax</string>
411411
</map>
412-
<key>dbus_glib</key>
413-
<map>
414-
<key>platforms</key>
415-
<map>
416-
<key>linux64</key>
417-
<map>
418-
<key>archive</key>
419-
<map>
420-
<key>hash</key>
421-
<string>7ee7b9aed3c0c8c09e7bf26bba7af8e1</string>
422-
<key>url</key>
423-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-dbus-glib/rev/314266/arch/Linux/installer/dbus_glib-0.76-linux64-314266.tar.bz2</string>
424-
</map>
425-
<key>name</key>
426-
<string>linux64</string>
427-
</map>
428-
</map>
429-
<key>license</key>
430-
<string>Academic Free License v. 2.1</string>
431-
<key>license_file</key>
432-
<string>LICENSES/dbus-glib.txt</string>
433-
<key>copyright</key>
434-
<string>Copyright (C) Red Hat Inc.</string>
435-
<key>version</key>
436-
<string>0.76</string>
437-
<key>name</key>
438-
<string>dbus_glib</string>
439-
<key>description</key>
440-
<string>D-Bus bindings for glib</string>
441-
</map>
442412
<key>dictionaries</key>
443413
<map>
444414
<key>platforms</key>
@@ -625,36 +595,6 @@
625595
<key>description</key>
626596
<string>Expat is an XML parser library written in C</string>
627597
</map>
628-
<key>fontconfig</key>
629-
<map>
630-
<key>platforms</key>
631-
<map>
632-
<key>linux64</key>
633-
<map>
634-
<key>archive</key>
635-
<map>
636-
<key>hash</key>
637-
<string>e2419d56960c160670051fbb055fb729</string>
638-
<key>url</key>
639-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-fontconfig/rev/314281/arch/Linux/installer/fontconfig-2.11.0-linux64-314281.tar.bz2</string>
640-
</map>
641-
<key>name</key>
642-
<string>linux64</string>
643-
</map>
644-
</map>
645-
<key>license</key>
646-
<string>bsd</string>
647-
<key>license_file</key>
648-
<string>LICENSES/fontconfig.txt</string>
649-
<key>copyright</key>
650-
<string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
651-
<key>version</key>
652-
<string>2.11.0</string>
653-
<key>name</key>
654-
<string>fontconfig</string>
655-
<key>description</key>
656-
<string>Fontconfig is a library for configuring and customizing font access.</string>
657-
</map>
658598
<key>freetype</key>
659599
<map>
660600
<key>copyright</key>
@@ -821,34 +761,6 @@
821761
<key>source_type</key>
822762
<string>git</string>
823763
</map>
824-
<key>gstreamer</key>
825-
<map>
826-
<key>platforms</key>
827-
<map>
828-
<key>linux64</key>
829-
<map>
830-
<key>archive</key>
831-
<map>
832-
<key>hash</key>
833-
<string>7c9d7cc88add7831a6afeedc20cad2fe</string>
834-
<key>url</key>
835-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gstreamer/rev/314267/arch/Linux/installer/gstreamer-0.10.6.314267-linux64-314267.tar.bz2</string>
836-
</map>
837-
<key>name</key>
838-
<string>linux64</string>
839-
</map>
840-
</map>
841-
<key>license</key>
842-
<string>LGPL</string>
843-
<key>license_file</key>
844-
<string>LICENSES/gstreamer.txt</string>
845-
<key>copyright</key>
846-
<string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
847-
<key>version</key>
848-
<string>0.10.6.314267</string>
849-
<key>name</key>
850-
<string>gstreamer</string>
851-
</map>
852764
<key>havok-source</key>
853765
<map>
854766
<key>platforms</key>
@@ -1267,36 +1179,6 @@
12671179
<key>description</key>
12681180
<string>PNG Reference library</string>
12691181
</map>
1270-
<key>libuuid</key>
1271-
<map>
1272-
<key>platforms</key>
1273-
<map>
1274-
<key>linux64</key>
1275-
<map>
1276-
<key>archive</key>
1277-
<map>
1278-
<key>hash</key>
1279-
<string>fb89f1281dd54d8b99b339fc5b712b27</string>
1280-
<key>url</key>
1281-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-libuuid/rev/314269/arch/Linux/installer/libuuid-1.6.2-linux64-314269.tar.bz2</string>
1282-
</map>
1283-
<key>name</key>
1284-
<string>linux64</string>
1285-
</map>
1286-
</map>
1287-
<key>license</key>
1288-
<string>UUID</string>
1289-
<key>license_file</key>
1290-
<string>LICENSES/uuid.txt</string>
1291-
<key>copyright</key>
1292-
<string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
1293-
<key>version</key>
1294-
<string>1.6.2</string>
1295-
<key>name</key>
1296-
<string>libuuid</string>
1297-
<key>description</key>
1298-
<string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
1299-
</map>
13001182
<key>libxml2</key>
13011183
<map>
13021184
<key>platforms</key>

‎indra/cmake/CMakeLists.txt

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,60 +11,75 @@ set(cmake_SOURCE_FILES
1111
Audio.cmake
1212
Boost.cmake
1313
bugsplat.cmake
14+
BuildPackagesInfo.cmake
1415
BuildVersion.cmake
1516
CEFPlugin.cmake
16-
CEFPlugin.cmake
1717
CMakeCopyIfDifferent.cmake
18-
CURL.cmake
1918
Copy3rdPartyLibs.cmake
20-
DBusGlib.cmake
19+
CubemapToEquirectangularJS.cmake
20+
CURL.cmake
2121
DeploySharedLibs.cmake
2222
DragDrop.cmake
2323
EXPAT.cmake
2424
FindAutobuild.cmake
25+
FindPipeWire.cmake
2526
FreeType.cmake
2627
GLEXT.cmake
2728
GLH.cmake
29+
GLIB.cmake
2830
GLM.cmake
31+
GStreamer10Plugin.cmake
2932
Havok.cmake
3033
Hunspell.cmake
34+
JPEG.cmake
35+
JPEGEncoderBasic.cmake
36+
LibVLCPlugin.cmake
37+
Linker.cmake
38+
Linking.cmake
3139
LLAddBuildTest.cmake
3240
LLAppearance.cmake
41+
LLAppearanceUtility.cmake
3342
LLAudio.cmake
3443
LLCommon.cmake
44+
LLCoreHttp.cmake
3545
LLImage.cmake
3646
LLKDU.cmake
47+
LLMath.cmake
3748
LLPhysicsExtensions.cmake
3849
LLPrimitive.cmake
3950
LLSharedLibs.cmake
4051
LLTestCommand.cmake
4152
LLWindow.cmake
42-
Linking.cmake
4353
Lualibs.cmake
4454
Meshoptimizer.cmake
55+
Mikktspace.cmake
4556
NDOF.cmake
4657
NFDE.cmake
58+
NGHTTP2.cmake
59+
NVAPI.cmake
4760
OPENAL.cmake
4861
OpenGL.cmake
4962
OpenJPEG.cmake
5063
OpenSSL.cmake
64+
OpenXR.cmake
5165
PNG.cmake
5266
PluginAPI.cmake
5367
Prebuilt.cmake
54-
PulseAudio.cmake
5568
Python.cmake
5669
SDL2.cmake
5770
TemplateCheck.cmake
71+
ThreeJS.cmake
5872
TinyEXR.cmake
5973
TinyGLTF.cmake
6074
Tracy.cmake
6175
Tut.cmake
6276
UI.cmake
6377
UnixInstall.cmake
6478
Variables.cmake
79+
ViewerManager.cmake
6580
ViewerMiscLibs.cmake
6681
VisualLeakDetector.cmake
67-
LibVLCPlugin.cmake
82+
VulkanGltf.cmake
6883
WebRTC.cmake
6984
xxHash.cmake
7085
ZLIBNG.cmake

‎indra/cmake/DBusGlib.cmake

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎indra/cmake/FindSCP.cmake

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎indra/cmake/GStreamer010Plugin.cmake

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎indra/cmake/LibVLCPlugin.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ include(Prebuilt)
55
include_guard()
66
add_library( ll::libvlc INTERFACE IMPORTED )
77

8+
if(LINUX)
9+
find_package(PkgConfig REQUIRED)
10+
11+
pkg_check_modules(libvlc REQUIRED IMPORTED_TARGET libvlc)
12+
target_link_libraries( ll::libvlc INTERFACE PkgConfig::libvlc)
13+
return()
14+
endif()
15+
816
use_prebuilt_binary(vlc-bin)
917
set(LIBVLCPLUGIN ON CACHE BOOL
1018
"LIBVLCPLUGIN support for the llplugin/llmedia test apps.")

‎indra/cmake/Prebuilt.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
include_guard()
33

44
include(FindAutobuild)
5-
if(INSTALL_PROPRIETARY)
6-
include(FindSCP)
7-
endif(INSTALL_PROPRIETARY)
85

96
set(PREBUILD_TRACKING_DIR ${AUTOBUILD_INSTALL_DIR}/cmake_tracking)
107
# For the library installation process;

‎indra/cmake/PulseAudio.cmake

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎indra/llwindow/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,6 @@ if (WINDOWS)
141141
)
142142
endif (WINDOWS)
143143

144-
if (SOLARIS)
145-
list(APPEND llwindow_SOURCE_FILES
146-
llwindowsolaris.cpp
147-
)
148-
list(APPEND llwindow_HEADER_FILES
149-
llwindowsolaris.h
150-
)
151-
endif (SOLARIS)
152-
153144
if (BUILD_HEADLESS)
154145
set(llwindowheadless_SOURCE_FILES
155146
llwindowmesaheadless.cpp

0 commit comments

Comments
 (0)