Replace mozjpeg with jpegli in snap
This commit is contained in:
		
							parent
							
								
									a1e2e3d011
								
							
						
					
					
						commit
						f57e2edf2a
					
				
					 1 changed files with 8 additions and 30 deletions
				
			
		| 
						 | 
					@ -131,6 +131,7 @@ parts:
 | 
				
			||||||
    cmake-parameters:
 | 
					    cmake-parameters:
 | 
				
			||||||
      - -DCMAKE_BUILD_TYPE=Release
 | 
					      - -DCMAKE_BUILD_TYPE=Release
 | 
				
			||||||
      - -DCMAKE_INSTALL_PREFIX=/usr
 | 
					      - -DCMAKE_INSTALL_PREFIX=/usr
 | 
				
			||||||
 | 
					      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
 | 
				
			||||||
      - -DTDESKTOP_API_ID=611335
 | 
					      - -DTDESKTOP_API_ID=611335
 | 
				
			||||||
      - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
 | 
					      - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
 | 
				
			||||||
      - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
 | 
					      - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
 | 
				
			||||||
| 
						 | 
					@ -158,7 +159,6 @@ parts:
 | 
				
			||||||
    after:
 | 
					    after:
 | 
				
			||||||
      - ffmpeg
 | 
					      - ffmpeg
 | 
				
			||||||
      - libjxl
 | 
					      - libjxl
 | 
				
			||||||
      - mozjpeg
 | 
					 | 
				
			||||||
      - openal
 | 
					      - openal
 | 
				
			||||||
      - protobuf
 | 
					      - protobuf
 | 
				
			||||||
      - qt
 | 
					      - qt
 | 
				
			||||||
| 
						 | 
					@ -238,10 +238,6 @@ parts:
 | 
				
			||||||
      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
 | 
					      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
 | 
				
			||||||
      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
 | 
					      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
 | 
				
			||||||
      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
 | 
					      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
 | 
				
			||||||
    stage:
 | 
					 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
 | 
					 | 
				
			||||||
    after:
 | 
					 | 
				
			||||||
      - mozjpeg
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  libjxl:
 | 
					  libjxl:
 | 
				
			||||||
    source: https://github.com/libjxl/libjxl.git
 | 
					    source: https://github.com/libjxl/libjxl.git
 | 
				
			||||||
| 
						 | 
					@ -257,7 +253,7 @@ parts:
 | 
				
			||||||
      - -DBUILD_TESTING=OFF
 | 
					      - -DBUILD_TESTING=OFF
 | 
				
			||||||
      - -DJPEGXL_ENABLE_DEVTOOLS=OFF
 | 
					      - -DJPEGXL_ENABLE_DEVTOOLS=OFF
 | 
				
			||||||
      - -DJPEGXL_ENABLE_TOOLS=OFF
 | 
					      - -DJPEGXL_ENABLE_TOOLS=OFF
 | 
				
			||||||
      - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
 | 
					      - -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON
 | 
				
			||||||
      - -DJPEGXL_ENABLE_DOXYGEN=OFF
 | 
					      - -DJPEGXL_ENABLE_DOXYGEN=OFF
 | 
				
			||||||
      - -DJPEGXL_ENABLE_MANPAGES=OFF
 | 
					      - -DJPEGXL_ENABLE_MANPAGES=OFF
 | 
				
			||||||
      - -DJPEGXL_ENABLE_BENCHMARK=OFF
 | 
					      - -DJPEGXL_ENABLE_BENCHMARK=OFF
 | 
				
			||||||
| 
						 | 
					@ -276,27 +272,6 @@ parts:
 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
 | 
					      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
 | 
				
			||||||
      - -./usr/share
 | 
					      - -./usr/share
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  mozjpeg:
 | 
					 | 
				
			||||||
    source: https://github.com/mozilla/mozjpeg.git
 | 
					 | 
				
			||||||
    source-depth: 1
 | 
					 | 
				
			||||||
    source-tag: v4.1.4
 | 
					 | 
				
			||||||
    plugin: cmake
 | 
					 | 
				
			||||||
    build-environment:
 | 
					 | 
				
			||||||
      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
 | 
					 | 
				
			||||||
    cmake-generator: Ninja
 | 
					 | 
				
			||||||
    cmake-parameters:
 | 
					 | 
				
			||||||
      - -DCMAKE_BUILD_TYPE=Release
 | 
					 | 
				
			||||||
      - -DCMAKE_INSTALL_PREFIX=/usr
 | 
					 | 
				
			||||||
      - -DENABLE_STATIC=OFF
 | 
					 | 
				
			||||||
      - -DWITH_JPEG8=ON
 | 
					 | 
				
			||||||
      - -DPNG_SUPPORTED=OFF
 | 
					 | 
				
			||||||
    prime:
 | 
					 | 
				
			||||||
      - -./usr/bin
 | 
					 | 
				
			||||||
      - -./usr/include
 | 
					 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
 | 
					 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
 | 
					 | 
				
			||||||
      - -./usr/share
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  openal:
 | 
					  openal:
 | 
				
			||||||
    source: https://github.com/kcat/openal-soft.git
 | 
					    source: https://github.com/kcat/openal-soft.git
 | 
				
			||||||
    source-depth: 1
 | 
					    source-depth: 1
 | 
				
			||||||
| 
						 | 
					@ -458,7 +433,9 @@ parts:
 | 
				
			||||||
        -confirm-license \
 | 
					        -confirm-license \
 | 
				
			||||||
        -openssl-linked \
 | 
					        -openssl-linked \
 | 
				
			||||||
        -nomake examples \
 | 
					        -nomake examples \
 | 
				
			||||||
        -nomake tests
 | 
					        -nomake tests \
 | 
				
			||||||
 | 
					        -- \
 | 
				
			||||||
 | 
					        -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
 | 
					      cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
 | 
				
			||||||
      DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
 | 
					      DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
 | 
				
			||||||
| 
						 | 
					@ -479,7 +456,7 @@ parts:
 | 
				
			||||||
      - -./usr/mkspecs
 | 
					      - -./usr/mkspecs
 | 
				
			||||||
      - -./usr/modules
 | 
					      - -./usr/modules
 | 
				
			||||||
    after:
 | 
					    after:
 | 
				
			||||||
      - mozjpeg
 | 
					      - libjxl
 | 
				
			||||||
      - patches
 | 
					      - patches
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  rnnoise:
 | 
					  rnnoise:
 | 
				
			||||||
| 
						 | 
					@ -559,10 +536,11 @@ parts:
 | 
				
			||||||
    cmake-parameters:
 | 
					    cmake-parameters:
 | 
				
			||||||
      - -DCMAKE_BUILD_TYPE=Release
 | 
					      - -DCMAKE_BUILD_TYPE=Release
 | 
				
			||||||
      - -DCMAKE_INSTALL_PREFIX=/usr
 | 
					      - -DCMAKE_INSTALL_PREFIX=/usr
 | 
				
			||||||
 | 
					      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
 | 
				
			||||||
    prime:
 | 
					    prime:
 | 
				
			||||||
      - -./usr/include
 | 
					      - -./usr/include
 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
 | 
					      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
 | 
				
			||||||
      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
 | 
					      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
 | 
				
			||||||
    after:
 | 
					    after:
 | 
				
			||||||
      - ffmpeg
 | 
					      - ffmpeg
 | 
				
			||||||
      - mozjpeg
 | 
					      - libjxl
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue