Add shared variants
This commit is contained in:
		
							parent
							
								
									869dd78b7b
								
							
						
					
					
						commit
						a0e82cca0c
					
				
					 11 changed files with 37 additions and 3 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -61,7 +61,7 @@ jobs:
 | 
				
			||||||
      fail-fast: false
 | 
					      fail-fast: false
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        target: [win64]
 | 
					        target: [win64]
 | 
				
			||||||
        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3]
 | 
					        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared]
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					@ -89,7 +89,7 @@ jobs:
 | 
				
			||||||
      fail-fast: false
 | 
					      fail-fast: false
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        target: [win64]
 | 
					        target: [win64]
 | 
				
			||||||
        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3]
 | 
					        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared]
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								.github/workflows/pr.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pr.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -10,7 +10,7 @@ jobs:
 | 
				
			||||||
      fail-fast: false
 | 
					      fail-fast: false
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        target: [win64]
 | 
					        target: [win64]
 | 
				
			||||||
        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3]
 | 
					        variant: [gpl,lgpl,gpl-vulkan,lgpl-vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared]
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								variants/default-install-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								variants/default-install-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,12 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					package_variant() {
 | 
				
			||||||
 | 
					    IN="$1"
 | 
				
			||||||
 | 
					    OUT="$2"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    mkdir -p "$OUT"/bin
 | 
				
			||||||
 | 
					    cp "$IN"/bin/* "$OUT"/bin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    mkdir -p "$OUT/doc"
 | 
				
			||||||
 | 
					    cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/defaults-gpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/defaults-gpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
 | 
				
			||||||
 | 
					FF_CONFIGURE+=" --enable-shared --disable-static"
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/defaults-lgpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/defaults-lgpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
 | 
				
			||||||
 | 
					FF_CONFIGURE+=" --enable-shared --disable-static"
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/win64-gpl-4.3-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/win64-gpl-4.3-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh
 | 
				
			||||||
 | 
					GIT_BRANCH="release/4.3"
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/win64-gpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/win64-gpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/default-install-shared.sh
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/defaults-gpl-shared.sh
 | 
				
			||||||
							
								
								
									
										2
									
								
								variants/win64-gpl-vulkan-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								variants/win64-gpl-vulkan-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,2 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/win64-lgpl-4.3-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/win64-lgpl-4.3-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh
 | 
				
			||||||
 | 
					GIT_BRANCH="release/4.3"
 | 
				
			||||||
							
								
								
									
										3
									
								
								variants/win64-lgpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								variants/win64-lgpl-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/default-install-shared.sh
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/defaults-lgpl-shared.sh
 | 
				
			||||||
							
								
								
									
										2
									
								
								variants/win64-lgpl-vulkan-shared.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								variants/win64-lgpl-vulkan-shared.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,2 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue