Merge branch 'topic/drawable' into topic/drawable-temp

* topic/drawable: (21 commits) build issues [pre-commit.ci] auto fixes from pre-commit.com hooks order drawables [pre-commit.ci] auto fixes from pre-commit.com hooks refactor [pre-commit.ci] pre-commit autoupdate (#1096) Add clang-format (#1086) Move generic shader lookup to context virtual Update paths from maplibre-gl-native to maplibre-native (#1090) missing includes warnings warnings warnings Eliminate GL drawable/builder dependencies from generic background layer Missing include Evaluate and apply color Revert GLES3 changes for OSMesa in Windows (#1079) [cmake] Use MLN prefix instead of MBGL (#1054) warnings Create security policy (#1080) ...
maplibre · May 3, 2023 · 12eef69 · 12eef69
2 parents 0f4bf61 + 2db8083
commit 12eef69
Show file tree

Hide file tree

Showing 1,146 changed files with 29,711 additions and 27,396 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,18 @@
+---
+BasedOnStyle: Google
+AccessModifierOffset: -4
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: Inline
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit: 120
+IncludeBlocks: Preserve
+IndentWidth: 4
+Language: Cpp
+PackConstructorInitializers: Never
+PenaltyBreakAssignment: 80
+SortIncludes: false
+SpacesBeforeTrailingComments: 1
+Standard: c++17
+...
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: "🙏 Q&A - GitHub Discussions"
-    url: https://github.com/maplibre/maplibre-gl-native/discussions/categories/q-a
+    url: https://github.com/maplibre/maplibre-native/discussions/categories/q-a
     about: If you have a question about using MapLibre Native
   - name: "💬 Chat with us on Slack"
     url: https://slack.openstreetmap.us/

diff --git a/.github/actions/qt5-build/entrypoint.sh b/.github/actions/qt5-build/entrypoint.sh
@@ -15,8 +15,8 @@ cmake ../source/ \
   -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
   -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
   -DCMAKE_INSTALL_PREFIX=../install \
-  -DMBGL_WITH_QT=ON \
-  -DMBGL_QT_DEPLOYMENT=ON \
-  -DMBGL_QT_LIBRARY_ONLY=ON
+  -DMLN_WITH_QT=ON \
+  -DMLN_QT_DEPLOYMENT=ON \
+  -DMLN_QT_LIBRARY_ONLY=ON
 ninja
 ninja install
diff --git a/.github/actions/qt6-build/entrypoint.sh b/.github/actions/qt6-build/entrypoint.sh
@@ -13,9 +13,9 @@ qt-cmake ../source/ \
   -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
   -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
   -DCMAKE_INSTALL_PREFIX=../install \
-  -DMBGL_WITH_QT=ON \
-  -DMBGL_QT_DEPLOYMENT=ON \
-  -DMBGL_QT_LIBRARY_ONLY=ON
+  -DMLN_WITH_QT=ON \
+  -DMLN_QT_DEPLOYMENT=ON \
+  -DMLN_QT_LIBRARY_ONLY=ON
 ninja
 ninja install
 cd ../install

diff --git a/.github/workflows/android-ci-pull.yml b/.github/workflows/android-ci-pull.yml
@@ -37,7 +37,7 @@ jobs:
       JOBS: 8
       BUILDTYPE: Debug
       IS_LOCAL_DEVELOPMENT: false
-      MBGL_ANDROID_STL: c++_static
+      MLN_ANDROID_STL: c++_static
     steps:
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -34,7 +34,7 @@ jobs:
       JOBS: 8
       BUILDTYPE: Debug
       IS_LOCAL_DEVELOPMENT: false
-      MBGL_ANDROID_STL: c++_static
+      MLN_ANDROID_STL: c++_static
     steps:
 
       - uses: actions/checkout@v3

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Build Maplibre GL Core
         run: |
           cmake --version
-          cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMBGL_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_COVERAGE=ON
+          cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMLN_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMLN_WITH_COVERAGE=ON
           cmake --build build --target mbgl-core mbgl-test-runner mbgl-render-test-runner
 
       - name: Archive mbgl-test-runner

diff --git a/.github/workflows/node-ci-mac.yml b/.github/workflows/node-ci-mac.yml
@@ -169,15 +169,15 @@ jobs:
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ github.ref }}
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}
 
-      - name: Configure maplibre-gl-native (MacOS)
+      - name: Configure maplibre-native (MacOS)
         if: runner.os == 'MacOS'
         run: |
           cmake . -B build \
             -G Ninja \
             -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 
-      - name: Configure maplibre-gl-native (Linux)
+      - name: Configure maplibre-native (Linux)
         if: runner.os == 'Linux'
         run: |
           cmake . -B build \
@@ -205,20 +205,20 @@ jobs:
           key: |
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ hashFiles( '.git/modules/platform/windows/vendor/vcpkg/HEAD' ) }}-${{ hashFiles( 'platform/windows/Get-VendorPackages.ps1' ) }}
 
-      - name: Configure maplibre-gl-native (Windows)
+      - name: Configure maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake . -B build \
             -G Ninja \
             -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
 
-      - name: Build maplibre-gl-native (MacOS/Linux)
+      - name: Build maplibre-native (MacOS/Linux)
         if: runner.os == 'MacOS' || runner.os == 'Linux'
         run: |
           cmake --build build -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null)
 
-      - name: Build maplibre-gl-native (Windows)
+      - name: Build maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake --build build

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
@@ -168,7 +168,7 @@ jobs:
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ github.ref }}
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}
 
-      - name: Configure maplibre-gl-native (MacOS)
+      - name: Configure maplibre-native (MacOS)
         if: runner.os == 'MacOS'
         run: |
           cmake . -B build \
@@ -177,7 +177,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DMLN_WITH_NODE=ON
 
-      - name: Configure maplibre-gl-native (Linux)
+      - name: Configure maplibre-native (Linux)
         if: runner.os == 'Linux'
         run: |
           cmake . -B build \
@@ -206,7 +206,7 @@ jobs:
           key: |
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ hashFiles( '.git/modules/platform/windows/vendor/vcpkg/HEAD' ) }}-${{ hashFiles( 'platform/windows/Get-VendorPackages.ps1' ) }}
 
-      - name: Configure maplibre-gl-native (Windows)
+      - name: Configure maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake . -B build \
@@ -215,12 +215,12 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
             -DMLN_WITH_NODE=ON
 
-      - name: Build maplibre-gl-native (MacOS/Linux)
+      - name: Build maplibre-native (MacOS/Linux)
         if: runner.os == 'MacOS' || runner.os == 'Linux'
         run: |
           cmake --build build -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null)
 
-      - name: Build maplibre-gl-native (Windows)
+      - name: Build maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake --build build

diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml
@@ -164,15 +164,15 @@ jobs:
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ github.ref }}
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}
 
-      - name: Configure maplibre-gl-native (MacOS)
+      - name: Configure maplibre-native (MacOS)
         if: runner.os == 'MacOS'
         run: |
           cmake . -B build \
             -G Ninja \
             -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 
-      - name: Configure maplibre-gl-native (Linux)
+      - name: Configure maplibre-native (Linux)
         if: runner.os == 'Linux'
         run: |
           cmake . -B build \
@@ -200,20 +200,20 @@ jobs:
           key: |
             ${{ matrix.runs-on }}-${{ env.BUILDTYPE }}-${{ github.job }}-${{ hashFiles( '.git/modules/platform/windows/vendor/vcpkg/HEAD' ) }}-${{ hashFiles( 'platform/windows/Get-VendorPackages.ps1' ) }}
 
-      - name: Configure maplibre-gl-native (Windows)
+      - name: Configure maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake . -B build \
             -G Ninja \
             -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
 
-      - name: Build maplibre-gl-native (MacOS/Linux)
+      - name: Build maplibre-native (MacOS/Linux)
         if: runner.os == 'MacOS' || runner.os == 'Linux'
         run: |
           cmake --build build -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null)
 
-      - name: Build maplibre-gl-native (Windows)
+      - name: Build maplibre-native (Windows)
         if: runner.os == 'Windows'
         run: |
           cmake --build build

diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml
@@ -182,7 +182,7 @@ jobs:
         with:
           key: Qt_${{ matrix.name }}_${{ matrix.qt_version }}
 
-      - name: Build maplibre-gl-native (macOS)
+      - name: Build maplibre-native (macOS)
         if: runner.os == 'macOS' && matrix.qt_target == 'desktop'
         run: |
           mkdir build && cd build
@@ -194,21 +194,21 @@ jobs:
             -DCMAKE_INSTALL_PREFIX="../install" \
             -DCMAKE_OSX_DEPLOYMENT_TARGET="${DEPLOYMENT_TARGET}" \
             -DCMAKE_OSX_ARCHITECTURES="${DEPLOYMENT_ARCH}" \
-            -DMBGL_WITH_QT=ON \
-            -DMBGL_QT_DEPLOYMENT=ON \
-            -DMBGL_QT_LIBRARY_ONLY=ON
+            -DMLN_WITH_QT=ON \
+            -DMLN_QT_DEPLOYMENT=ON \
+            -DMLN_QT_LIBRARY_ONLY=ON
           ninja
           ninja install
 
-      - name: Build maplibre-gl-native (Linux, Qt5)
+      - name: Build maplibre-native (Linux, Qt5)
         if: runner.os == 'Linux' && matrix.qt_version == '5.15.2'
         uses: ./source/.github/actions/qt5-build
 
-      - name: Build maplibre-gl-native (Linux, Qt6)
+      - name: Build maplibre-native (Linux, Qt6)
         if: runner.os == 'Linux' && matrix.qt_version != '5.15.2'
         uses: ./source/.github/actions/qt6-build
 
-      - name: Build maplibre-gl-native (Windows)
+      - name: Build maplibre-native (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: |
@@ -221,9 +221,9 @@ jobs:
             -DCMAKE_C_COMPILER_LAUNCHER="ccache.exe" \
             -DCMAKE_CXX_COMPILER_LAUNCHER="ccache.exe" \
             -DCMAKE_INSTALL_PREFIX="../install" \
-            -DMBGL_WITH_QT=ON \
-            -DMBGL_QT_DEPLOYMENT=ON \
-            -DMBGL_QT_LIBRARY_ONLY=ON
+            -DMLN_WITH_QT=ON \
+            -DMLN_QT_DEPLOYMENT=ON \
+            -DMLN_QT_LIBRARY_ONLY=ON
           ninja.exe
           ninja.exe install
 
@@ -240,14 +240,14 @@ jobs:
           QT_VERSION: ${{ matrix.qt_version }}
         run: |
           pushd install
-          tar cjvf ../maplibre-gl-native_${QT_ARCH}_Qt${QT_VERSION}.tar.bz2 *
+          tar cjvf ../maplibre-native_${QT_ARCH}_Qt${QT_VERSION}.tar.bz2 *
           popd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
-          path: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}.tar.bz2
+          name: maplibre-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
+          path: maplibre-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}.tar.bz2
 
   test-tarball:
     needs: build
@@ -277,7 +277,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
+          name: maplibre-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
 
       - name: Download Qt
         uses: jurplel/install-qt-action@v3
@@ -296,7 +296,7 @@ jobs:
       - name: Build test app
         run: |
           mkdir install && cd install
-          tar xf ../maplibre-gl-native_${QT_ARCH}_Qt${QT_VERSION}.tar.bz2
+          tar xf ../maplibre-native_${QT_ARCH}_Qt${QT_VERSION}.tar.bz2
           cd ..
           export CMAKE_PREFIX_PATH=$PWD/install
           mkdir build && cd build
@@ -320,15 +320,15 @@ jobs:
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
-        name: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
+        name: maplibre-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}
 
     - name: Name tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
         TAG_PLATFORM: ${{ matrix.name }}
         QT_VERSION: ${{ matrix.qt_version }}
       run: |
-        mv maplibre-gl-native_${TAG_PLATFORM}_Qt${QT_VERSION}.tar.bz2 QMapLibreGL_${TAG_NAME//qt-/}_Qt${QT_VERSION}_${TAG_PLATFORM}.tar.bz2
+        mv maplibre-native_${TAG_PLATFORM}_Qt${QT_VERSION}.tar.bz2 QMapLibreGL_${TAG_NAME//qt-/}_Qt${QT_VERSION}_${TAG_PLATFORM}.tar.bz2
 
     - name: Release
       uses: ncipollo/release-action@v1

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+repos:
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v16.0.2
+  hooks:
+  - id: clang-format
+    files: '.*\.(hpp|cpp|h)'
+    exclude: '(vendor/.*|platform/(ios|darwin)/.*|test/ios/.*|render-test/ios/.*|benchmark/ios/.*)'
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -26,7 +26,7 @@ cc_library(
         "src",
     ],
     local_defines = [
-        r"MBGL_VERSION_REV=\"standalone\"",
+        r"MLN_VERSION_REV=\"standalone\"",
     ],
     visibility = ["//visibility:public"],
     deps = [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,15 +5,16 @@
 ### ✨ New features
 
 - *...Add new stuff here...*
-- [windows] Added windows build support for core applications and node [#707](https://github.com/maplibre/maplibre-gl-native/pull/707)
-- [core] Add `ClientOptions` to configure client information [#365](https://github.com/maplibre/maplibre-gl-native/pull/365).
-- [node] Add workflow to create node binary releases for Ubuntu 20.04 x64 and MacOS 12 x64/arm64 [#378](https://github.com/maplibre/maplibre-gl-native/pull/378), [#459](https://github.com/maplibre/maplibre-gl-native/pull/459).
+- [core] All CMake properties are now prefixed `MLN_*` [1054](https://github.com/maplibre/maplibre-native/pull/1054).
+- [windows] Added windows build support for core applications and node [#707](https://github.com/maplibre/maplibre-native/pull/707)
+- [core] Add `ClientOptions` to configure client information [#365](https://github.com/maplibre/maplibre-native/pull/365).
+- [node] Add workflow to create node binary releases for Ubuntu 20.04 x64 and MacOS 12 x64/arm64 [#378](https://github.com/maplibre/maplibre-native/pull/378), [#459](https://github.com/maplibre/maplibre-native/pull/459).
 
 ### ✨ Technical Improvements
 
 - *...Add new stuff here...*
-- Bump [maplibre-native-base](https://github.com/maplibre/maplibre-native-base) from 2.0.0 to 2.1.1 ([#397](https://github.com/maplibre/maplibre-gl-native/pull/397), [#406](https://github.com/maplibre/maplibre-gl-native/pull/406))
-- Bump [wagyu](https://github.com/mapbox/wagyu) from 0.4.3 to 0.5.0 [#398](https://github.com/maplibre/maplibre-gl-native/pull/398)
+- Bump [maplibre-native-base](https://github.com/maplibre/maplibre-native-base) from 2.0.0 to 2.1.1 ([#397](https://github.com/maplibre/maplibre-native/pull/397), [#406](https://github.com/maplibre/maplibre-native/pull/406))
+- Bump [wagyu](https://github.com/mapbox/wagyu) from 0.4.3 to 0.5.0 [#398](https://github.com/maplibre/maplibre-native/pull/398)
 - Bump [eternal](https://github.com/mapbox/eternal.git) from 1.0.0 to 1.0.1
 - Bump [protozero](https://github.com/mapbox/protozero.git) from 1.7.0 to 1.7.1
 - Bump [vector-tile](https://github.com/mapbox/vector-tile.git) from 1.0.3 to 1.0.4
@@ -25,9 +26,9 @@
 ### 🐞 Bug fixes
 
 - *...Add new stuff here...*
-- [core] Fix memory access violation exception in vector_tile_data.cpp [#632](https://github.com/maplibre/maplibre-gl-native/pull/632)
-- [iOS] Fix a bug where the compass was determined to be misplaced when hidden [#498](https://github.com/maplibre/maplibre-gl-native/pull/498).
-- [core] `MaptilerFileSource` renamed to `MBTilesFileSource` [#198](https://github.com/maplibre/maplibre-gl-native/pull/198).
+- [core] Fix memory access violation exception in vector_tile_data.cpp [#632](https://github.com/maplibre/maplibre-native/pull/632)
+- [iOS] Fix a bug where the compass was determined to be misplaced when hidden [#498](https://github.com/maplibre/maplibre-native/pull/498).
+- [core] `MaptilerFileSource` renamed to `MBTilesFileSource` [#198](https://github.com/maplibre/maplibre-native/pull/198).
 
 ## maps-v1.6.0