Clean up x265 build and warnings
This commit is contained in:
		
							parent
							
								
									9621ad17de
								
							
						
					
					
						commit
						f2ab61d2f3
					
				
					 1 changed files with 13 additions and 4 deletions
				
			
		| 
						 | 
					@ -13,11 +13,20 @@ ffbuild_dockerbuild() {
 | 
				
			||||||
    cd x265
 | 
					    cd x265
 | 
				
			||||||
    git checkout "$X265_COMMIT"
 | 
					    git checkout "$X265_COMMIT"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    local common_config=(
 | 
				
			||||||
 | 
					        -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX"
 | 
				
			||||||
 | 
					        -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN"
 | 
				
			||||||
 | 
					        -DCMAKE_BUILD_TYPE=Release
 | 
				
			||||||
 | 
					        -DENABLE_SHARED=OFF
 | 
				
			||||||
 | 
					        -DENABLE_CLI=OFF
 | 
				
			||||||
 | 
					        -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if [[ $TARGET != *32 ]]; then
 | 
					    if [[ $TARGET != *32 ]]; then
 | 
				
			||||||
        mkdir 8bit 10bit 12bit
 | 
					        mkdir 8bit 10bit 12bit
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON -DENABLE_HDR10_PLUS=ON -S source -B 12bit &
 | 
					        cmake "${common_config[@]}" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_HDR10_PLUS=ON -DMAIN12=ON -S source -B 12bit &
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DENABLE_HDR10_PLUS=ON -S source -B 10bit &
 | 
					        cmake "${common_config[@]}" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_HDR10_PLUS=ON -S source -B 10bit &
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -S source -B 8bit &
 | 
					        cmake "${common_config[@]}" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -S source -B 8bit &
 | 
				
			||||||
        wait
 | 
					        wait
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        cat >Makefile <<"EOF"
 | 
					        cat >Makefile <<"EOF"
 | 
				
			||||||
| 
						 | 
					@ -47,7 +56,7 @@ EOF
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
        mkdir 8bit
 | 
					        mkdir 8bit
 | 
				
			||||||
        cd 8bit
 | 
					        cd 8bit
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source
 | 
					        cmake "${common_config[@]}" ../source
 | 
				
			||||||
        make -j$(nproc)
 | 
					        make -j$(nproc)
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue