Globally drop yasm - libvpx should not need it
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
This commit is contained in:
		
							parent
							
								
									bfe282c2db
								
							
						
					
					
						commit
						2d995826ad
					
				
							
								
								
									
										3
									
								
								.github/workflows/bridge.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/bridge.yml
									
									
									
									
										vendored
									
									
								
							| @ -44,8 +44,7 @@ jobs: | |||||||
|             nasm \ |             nasm \ | ||||||
|             ninja-build \ |             ninja-build \ | ||||||
|             pkg-config \ |             pkg-config \ | ||||||
|             wget \ |             wget | ||||||
|             yasm |  | ||||||
| 
 | 
 | ||||||
|       - name: Install Rust toolchain |       - name: Install Rust toolchain | ||||||
|         uses: actions-rs/toolchain@v1 |         uses: actions-rs/toolchain@v1 | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @ -114,8 +114,7 @@ jobs: | |||||||
|                libxdo-dev \ |                libxdo-dev \ | ||||||
|                libxfixes-dev \ |                libxfixes-dev \ | ||||||
|                nasm \ |                nasm \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|             ;; |             ;; | ||||||
|           # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;; |           # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;; | ||||||
|           # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;; |           # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;; | ||||||
|  | |||||||
							
								
								
									
										40
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							| @ -348,7 +348,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|       - name: Install build runtime |       - name: Install build runtime | ||||||
|         run: | |         run: | | ||||||
|           brew install llvm create-dmg nasm yasm cmake gcc wget ninja pkg-config |           brew install llvm create-dmg nasm cmake gcc wget ninja pkg-config | ||||||
| 
 | 
 | ||||||
|       - name: Install flutter |       - name: Install flutter | ||||||
|         uses: subosito/flutter-action@v2 |         uses: subosito/flutter-action@v2 | ||||||
| @ -459,7 +459,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|       - name: Install dependencies |       - name: Install dependencies | ||||||
|         run: | |         run: | | ||||||
|           brew install nasm yasm |           brew install nasm | ||||||
|       - name: Checkout source code |       - name: Checkout source code | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
|       - name: Install flutter |       - name: Install flutter | ||||||
| @ -592,8 +592,7 @@ jobs: | |||||||
|                openjdk-11-jdk-headless \ |                openjdk-11-jdk-headless \ | ||||||
|                pkg-config \ |                pkg-config \ | ||||||
|                tree \ |                tree \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
| 
 | 
 | ||||||
|       - name: Checkout source code |       - name: Checkout source code | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
| @ -782,7 +781,7 @@ jobs: | |||||||
|           sudo rm -rf /usr/local/lib/android |           sudo rm -rf /usr/local/lib/android | ||||||
|           sudo rm -rf /usr/share/dotnet |           sudo rm -rf /usr/share/dotnet | ||||||
|           sudo apt-get update -y |           sudo apt-get update -y | ||||||
|           sudo apt-get install -y nasm qemu-user-static yasm |           sudo apt-get install -y nasm qemu-user-static | ||||||
| 
 | 
 | ||||||
|       - name: Checkout source code |       - name: Checkout source code | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
| @ -880,8 +879,7 @@ jobs: | |||||||
|                ninja-build \ |                ninja-build \ | ||||||
|                pkg-config \ |                pkg-config \ | ||||||
|                tree \ |                tree \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|             # we have libopus compiled by us. |             # we have libopus compiled by us. | ||||||
|             apt-get remove -y libopus-dev || true |             apt-get remove -y libopus-dev || true | ||||||
|             # output devs |             # output devs | ||||||
| @ -985,7 +983,6 @@ jobs: | |||||||
|                unzip \ |                unzip \ | ||||||
|                xz-utils \ |                xz-utils \ | ||||||
|                wget \ |                wget \ | ||||||
|                yasm \ |  | ||||||
|                zip |                zip | ||||||
| 
 | 
 | ||||||
|       #- name: Maximize build space |       #- name: Maximize build space | ||||||
| @ -1097,8 +1094,7 @@ jobs: | |||||||
|                ninja-build \ |                ninja-build \ | ||||||
|                pkg-config \ |                pkg-config \ | ||||||
|                tree \ |                tree \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|             # we have libopus compiled by us. |             # we have libopus compiled by us. | ||||||
|             apt-get remove -y libopus-dev || true |             apt-get remove -y libopus-dev || true | ||||||
|             # output devs |             # output devs | ||||||
| @ -1180,7 +1176,6 @@ jobs: | |||||||
|                pkg-config \ |                pkg-config \ | ||||||
|                unzip \ |                unzip \ | ||||||
|                xz-utils \ |                xz-utils \ | ||||||
|                yasm \ |  | ||||||
|                zip |                zip | ||||||
| 
 | 
 | ||||||
|       #- name: Maximize build space |       #- name: Maximize build space | ||||||
| @ -1277,8 +1272,7 @@ jobs: | |||||||
|                rpm \ |                rpm \ | ||||||
|                unzip \ |                unzip \ | ||||||
|                wget \ |                wget \ | ||||||
|                xz-utils \ |                xz-utils | ||||||
|                yasm |  | ||||||
|           run: | |           run: | | ||||||
|             # disable git safe.directory |             # disable git safe.directory | ||||||
|             git config --global --add safe.directory "*" |             git config --global --add safe.directory "*" | ||||||
| @ -1390,8 +1384,7 @@ jobs: | |||||||
|                libarchive-tools \ |                libarchive-tools \ | ||||||
|                libgtk-3-dev \ |                libgtk-3-dev \ | ||||||
|                nasm \ |                nasm \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|           mkdir -p ./target/release/ |           mkdir -p ./target/release/ | ||||||
| 
 | 
 | ||||||
|       - name: Restore the rustdesk lib file |       - name: Restore the rustdesk lib file | ||||||
| @ -1447,8 +1440,7 @@ jobs: | |||||||
|                rpm \ |                rpm \ | ||||||
|                unzip \ |                unzip \ | ||||||
|                wget \ |                wget \ | ||||||
|                xz-utils \ |                xz-utils | ||||||
|                yasm |  | ||||||
|           run: | |           run: | | ||||||
|             # disable git safe.directory |             # disable git safe.directory | ||||||
|             git config --global --add safe.directory "*" |             git config --global --add safe.directory "*" | ||||||
| @ -1592,7 +1584,6 @@ jobs: | |||||||
|       #       gcc |       #       gcc | ||||||
|       #       curl |       #       curl | ||||||
|       #       wget |       #       wget | ||||||
|       #       yasm |  | ||||||
|       #       nasm |       #       nasm | ||||||
|       #       zip |       #       zip | ||||||
|       #       make |       #       make | ||||||
| @ -1676,8 +1667,7 @@ jobs: | |||||||
|                libarchive-tools \ |                libarchive-tools \ | ||||||
|                libgtk-3-dev \ |                libgtk-3-dev \ | ||||||
|                nasm \ |                nasm \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|           mkdir -p ./target/release/ |           mkdir -p ./target/release/ | ||||||
| 
 | 
 | ||||||
|       - name: Restore the rustdesk lib file |       - name: Restore the rustdesk lib file | ||||||
| @ -1719,8 +1709,7 @@ jobs: | |||||||
|                rpm \ |                rpm \ | ||||||
|                unzip \ |                unzip \ | ||||||
|                wget \ |                wget \ | ||||||
|                xz-utils \ |                xz-utils | ||||||
|                yasm |  | ||||||
|           run: | |           run: | | ||||||
|             # disable git safe.directory |             # disable git safe.directory | ||||||
|             git config --global --add safe.directory "*" |             git config --global --add safe.directory "*" | ||||||
| @ -1806,7 +1795,6 @@ jobs: | |||||||
|             gcc |             gcc | ||||||
|             curl |             curl | ||||||
|             wget |             wget | ||||||
|             yasm |  | ||||||
|             nasm |             nasm | ||||||
|             zip |             zip | ||||||
|             make |             make | ||||||
| @ -1923,8 +1911,7 @@ jobs: | |||||||
|   #             g++ \ |   #             g++ \ | ||||||
|   #             libgtk-3-dev \ |   #             libgtk-3-dev \ | ||||||
|   #             nasm \ |   #             nasm \ | ||||||
|   #             wget \ |   #             wget | ||||||
|   #             yasm |  | ||||||
|   #           # flatpak deps |   #           # flatpak deps | ||||||
|   #           flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo |   #           flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo | ||||||
|   #           flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08 |   #           flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08 | ||||||
| @ -2001,8 +1988,7 @@ jobs: | |||||||
|                g++ \ |                g++ \ | ||||||
|                libgtk-3-dev \ |                libgtk-3-dev \ | ||||||
|                nasm \ |                nasm \ | ||||||
|                wget \ |                wget | ||||||
|                yasm |  | ||||||
|             # flatpak deps |             # flatpak deps | ||||||
|             flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo |             flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo | ||||||
|             flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08 |             flatpak --user install -y flathub org.freedesktop.Platform/${{ matrix.job.arch }}/23.08 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user