Skip to content

Commit e2e66a5

Browse files
electronstudioelectronstudio
committed
wayland in linux build
1 parent 61b459b commit e2e66a5

22 files changed

Lines changed: 60 additions & 57440 deletions

‎.cirrus.yml‎

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

‎.github/workflows/build.yml‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
mkdir build
7171
cd build
7272
cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
73-
make -j2
73+
make -j4
7474
sudo make install
7575
7676
- name: Build raylib with SDL if selected
@@ -79,7 +79,7 @@ jobs:
7979
mkdir build2
8080
cd build2
8181
cmake -DPLATFORM=${{ matrix.raylib-platform }} -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
82-
make -j2
82+
make -j4
8383
sudo cp raylib/libraylib.a /usr/local/lib/libraylib.a
8484
8585
- name: Copy extras
@@ -181,7 +181,7 @@ jobs:
181181
mkdir build
182182
cd build
183183
cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
184-
make -j2
184+
make -j4
185185
sudo make install
186186
187187
- name: Build raylib with SDL if selected
@@ -190,7 +190,7 @@ jobs:
190190
mkdir build2
191191
cd build2
192192
cmake -DPLATFORM=${{ matrix.raylib-platform }} -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
193-
make -j2
193+
make -j4
194194
sudo cp raylib/libraylib.a /usr/local/lib/libraylib.a
195195
196196
- name: Copy extras
@@ -279,6 +279,13 @@ jobs:
279279
run: |
280280
ln -s /usr/local/bin /__e/node20/bin
281281
282+
- name: setup wayland
283+
run: |
284+
apt-get update
285+
apt-get install -y libwayland-dev wayland-protocols
286+
# Ubuntu 16 has an older wayland-scanner that expects "code" instead of "private-code".
287+
sed -i 's/private-code/code/g' raylib-c/src/external/glfw/src/CMakeLists.txt
288+
282289
- name: update cmake
283290
run: |
284291
wget https://github.com/Kitware/CMake/releases/download/v3.31.10/cmake-3.31.10-linux-x86_64.tar.gz
@@ -319,8 +326,8 @@ jobs:
319326
OPENGL="3.3"
320327
fi
321328
echo "OPENGL $OPENGL PLATFORM $PLATFORM"
322-
cmake -DPLATFORM="$PLATFORM" -DOPENGL_VERSION="$OPENGL" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
323-
make -j2
329+
cmake -DPLATFORM="$PLATFORM" -DOPENGL_VERSION="$OPENGL" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_WAYLAND=ON -DGLFW_BUILD_X11=ON ..
330+
make -j4
324331
make install
325332
- name: Copy extras
326333
run: |
@@ -456,7 +463,7 @@ jobs:
456463
fi
457464
echo "OPENGL $OPENGL PLATFORM $PLATFORM"
458465
cmake -DPLATFORM="$PLATFORM" -DOPENGL_VERSION="$OPENGL" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
459-
make -j2
466+
make -j4
460467
make install
461468
- name: Copy extras
462469
run: |
@@ -542,7 +549,7 @@ jobs:
542549
- name: install libs
543550
run: |
544551
sudo apt update
545-
sudo apt -y install cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev libgbm-dev libdrm-dev
552+
sudo apt -y install cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev wayland-protocols libxkbcommon-dev libgbm-dev libdrm-dev
546553
547554
- name: Build SDL
548555
run: |
@@ -575,8 +582,8 @@ jobs:
575582
OPENGL="2.1"
576583
fi
577584
echo "OPENGL $OPENGL PLATFORM $PLATFORM"
578-
cmake -DPLATFORM="$PLATFORM" -DOPENGL_VERSION="$OPENGL" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
579-
make -j2
585+
cmake -DPLATFORM="$PLATFORM" -DOPENGL_VERSION="$OPENGL" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_WAYLAND=ON -DGLFW_BUILD_X11=ON ..
586+
make -j4
580587
sudo make install
581588
582589
- name: Copy extras
@@ -689,7 +696,7 @@ jobs:
689696
mkdir build
690697
cd build
691698
cmake -DPLATFORM="DRM" -DOPENGL_VERSION="ES 2.0" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
692-
make -j2
699+
make -j4
693700
make install
694701
695702
- name: Copy extras
@@ -1017,7 +1024,7 @@ jobs:
10171024
mkdir build
10181025
cd build
10191026
cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_BUSY_WAIT_LOOP=OFF -DSUPPORT_CUSTOM_FRAME_CONTROL=OFF -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
1020-
make -j2
1027+
make -j4
10211028
sudo make install
10221029
- name: Copy extras
10231030
run: |

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ original Raylib.
2121

2222
# Quickstart
2323

24-
`pip3 install raylib==6.0.0.0 --break-system-packages`
24+
`pip3 install raylib==6.0.1.0 --break-system-packages`
2525
```python
2626
from pyray import *
2727
init_window(800, 450, "Hello")
@@ -74,7 +74,7 @@ Then make sure you have the latest pip installed:
7474
Then install
7575

7676
python3 -m pip install setuptools
77-
python3 -m pip install raylib==6.0.0.0
77+
python3 -m pip install raylib==6.0.1.0
7878

7979
On most platforms it should install a binary wheel. If yours isn't available then pip will attempt to build from
8080
source, in which case you will need to have Raylib development libs installed, e.g.
@@ -96,7 +96,7 @@ Older MacOS requires building from source but this is usually simple:
9696

9797
brew install pkg-config
9898
brew install raylib
99-
python3 -m pip install raylib==6.0.0.0
99+
python3 -m pip install raylib==6.0.1.0
100100

101101
## Linux
102102

‎docs/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: ec7aaf8243c629b18f34bdbd5ba374b1
3+
config: 7faffbffd708531c584ff6cc7a8aa99d
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/README.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ <h2>Platforms: Windows, Mac, Linux, Raspberry Pi, Web<a class="headerlink" href=
142142
</section>
143143
<section id="quickstart">
144144
<h1>Quickstart<a class="headerlink" href="#quickstart" title="Link to this heading"></a></h1>
145-
<p><code class="docutils literal notranslate"><span class="pre">pip3</span> <span class="pre">install</span> <span class="pre">raylib==6.0.0.0</span> <span class="pre">--break-system-packages</span></code></p>
145+
<p><code class="docutils literal notranslate"><span class="pre">pip3</span> <span class="pre">install</span> <span class="pre">raylib==6.0.1.0</span> <span class="pre">--break-system-packages</span></code></p>
146146
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span><span class="w"> </span><span class="nn">pyray</span><span class="w"> </span><span class="kn">import</span> <span class="o">*</span>
147147
<span class="n">init_window</span><span class="p">(</span><span class="mi">800</span><span class="p">,</span> <span class="mi">450</span><span class="p">,</span> <span class="s2">&quot;Hello&quot;</span><span class="p">)</span>
148148
<span class="k">while</span> <span class="ow">not</span> <span class="n">window_should_close</span><span class="p">():</span>
@@ -157,9 +157,11 @@ <h1>Quickstart<a class="headerlink" href="#quickstart" title="Link to this headi
157157
</section>
158158
<section id="videos">
159159
<h1>Videos<a class="headerlink" href="#videos" title="Link to this heading"></a></h1>
160-
<p><a href="https://www.youtube.com/watch?v=MIgq9w0MUsM"><img src="https://img.youtube.com/vi/MIgq9w0MUsM/0.jpg" alt="video"/></a></p>
161-
<p><a href="https://www.youtube.com/watch?v=UoAsDlUwjy0"><img src="https://img.youtube.com/vi/UoAsDlUwjy0/0.jpg" alt="video"/></a></p>
162-
<p><a class="reference external" href="https://www.youtube.com/&#64;FinFET/videos">more videos</a></p>
160+
<p><a href="https://www.youtube.com/watch?v=MIgq9w0MUsM">FinFET - Making a simple 3D game in Python (for real) with Raylib<br><img src="https://img.youtube.com/vi/MIgq9w0MUsM/0.jpg" alt="video"/></a></p>
161+
<p><a class="reference external" href="https://www.youtube.com/&#64;FinFET/videos">more on FinFET</a></p>
162+
<p><a href="https://www.youtube.com/watch?v=UoAsDlUwjy0">Clear Code - The ultimate introduction to Raylib<br><img src="https://img.youtube.com/vi/UoAsDlUwjy0/0.jpg" alt="video"/></a></p>
163+
<p><a href="https://www.youtube.com/watch?v=OSRbm2ocVjY">Unconventional Coding - I Made My Own Video Editor Because Kdenlive Is Too Slow<br><img src="https://img.youtube.com/vi/OSRbm2ocVjY/0.jpg" alt="video"/></a></p>
164+
<p><a href="https://www.youtube.com/watch?v=hbe1zKUAxuU">WOBLO GAMES - The Druid’s Downfall<br><img src="https://img.youtube.com/vi/hbe1zKUAxuU/0.jpg" alt="video"/></a></p>
163165
</section>
164166
<section id="links">
165167
<h1>Links<a class="headerlink" href="#links" title="Link to this heading"></a></h1>
@@ -186,7 +188,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Link to this h
186188
</div>
187189
<p>Then install</p>
188190
<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>python3 -m pip install setuptools
189-
python3 -m pip install raylib==6.0.0.0
191+
python3 -m pip install raylib==6.0.1.0
190192
</pre></div>
191193
</div>
192194
<p>On most platforms it should install a binary wheel. If yours isn’t available then pip will attempt to build from
@@ -207,7 +209,7 @@ <h2>MacOS<a class="headerlink" href="#macos" title="Link to this heading"></a
207209
<p>Older MacOS requires building from source but this is usually simple:</p>
208210
<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>brew install pkg-config
209211
brew install raylib
210-
python3 -m pip install raylib==6.0.0.0
212+
python3 -m pip install raylib==6.0.1.0
211213
</pre></div>
212214
</div>
213215
</section>

‎docs/_sources/README.md.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ original Raylib.
2121

2222
# Quickstart
2323

24-
`pip3 install raylib==6.0.0.0 --break-system-packages`
24+
`pip3 install raylib==6.0.1.0 --break-system-packages`
2525
```python
2626
from pyray import *
2727
init_window(800, 450, "Hello")
@@ -39,14 +39,16 @@ Use the [project generator](https://github.com/electronstudio/python-raylib-temp
3939

4040
# Videos
4141

42+
<a href="https://www.youtube.com/watch?v=MIgq9w0MUsM">FinFET - Making a simple 3D game in Python (for real) with Raylib<br><img src="https://img.youtube.com/vi/MIgq9w0MUsM/0.jpg" alt="video"/></a>
4243

43-
<a href="https://www.youtube.com/watch?v=MIgq9w0MUsM"><img src="https://img.youtube.com/vi/MIgq9w0MUsM/0.jpg" alt="video"/></a>
44+
[more on FinFET](https://www.youtube.com/@FinFET/videos)
4445

45-
<a href="https://www.youtube.com/watch?v=UoAsDlUwjy0"><img src="https://img.youtube.com/vi/UoAsDlUwjy0/0.jpg" alt="video"/></a>
46+
<a href="https://www.youtube.com/watch?v=UoAsDlUwjy0">Clear Code - The ultimate introduction to Raylib<br><img src="https://img.youtube.com/vi/UoAsDlUwjy0/0.jpg" alt="video"/></a>
4647

48+
<a href="https://www.youtube.com/watch?v=OSRbm2ocVjY">Unconventional Coding - I Made My Own Video Editor Because Kdenlive Is Too Slow<br><img src="https://img.youtube.com/vi/OSRbm2ocVjY/0.jpg" alt="video"/></a>
4749

50+
<a href="https://www.youtube.com/watch?v=hbe1zKUAxuU">WOBLO GAMES - The Druid's Downfall<br><img src="https://img.youtube.com/vi/hbe1zKUAxuU/0.jpg" alt="video"/></a>
4851

49-
[more videos](https://www.youtube.com/@FinFET/videos)
5052

5153
# Links
5254

@@ -72,7 +74,7 @@ Then make sure you have the latest pip installed:
7274
Then install
7375

7476
python3 -m pip install setuptools
75-
python3 -m pip install raylib==6.0.0.0
77+
python3 -m pip install raylib==6.0.1.0
7678

7779
On most platforms it should install a binary wheel. If yours isn't available then pip will attempt to build from
7880
source, in which case you will need to have Raylib development libs installed, e.g.
@@ -94,7 +96,7 @@ Older MacOS requires building from source but this is usually simple:
9496

9597
brew install pkg-config
9698
brew install raylib
97-
python3 -m pip install raylib==6.0.0.0
99+
python3 -m pip install raylib==6.0.1.0
98100

99101
## Linux
100102

0 commit comments

Comments
 (0)