Skip to content

Commit 4b6ed8c

Browse files
lukasflukasf
authored
Merge pull request #252 from ffmpeginteropx/release-1.0
Merged. Welcome to v1.0.0!
2 parents e6e23ab + 888f69c commit 4b6ed8c

File tree

111 files changed

+1063
-1327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1063
-1327
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ bld/
2525
[Oo]bj/
2626
[Ll]og/
2727
Generated Files/
28-
Build/
2928
Intermediate/
3029
Output/
3130
FFmpegUWP/

‎AppVeyor_Build.bat

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
md Output\NuGet
22

3-
nuget restore FFmpegInterop.sln
3+
nuget restore FFmpegInteropX.sln
44

5-
msbuild FFmpegInterop.sln /m /t:build /p:Configuration=Debug;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
5+
msbuild FFmpegInteropX.sln /m /t:build /p:Configuration=Debug;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
66

7-
msbuild FFmpegInterop\FFmpegInterop.vcxproj /t:build /p:Configuration=Release;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
7+
msbuild Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
88

9-
msbuild FFmpegInterop\FFmpegInterop.vcxproj /t:build /p:Configuration=Release;Platform=x64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
9+
msbuild Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=x64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
1010

11-
msbuild FFmpegInterop\FFmpegInterop.vcxproj /t:build /p:Configuration=Release;Platform=ARM;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
11+
msbuild Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=ARM;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
1212

13-
msbuild FFmpegInterop\FFmpegInterop.vcxproj /t:build /p:Configuration=Release;Platform=ARM64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
13+
msbuild Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=ARM64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
1414

15-
nuget pack FFmpegInteropX.nuspec -Properties id=FFmpegInteropX -Version %1 -Symbols -SymbolPackageFormat snupkg
15+
nuget pack Build\FFmpegInteropX.nuspec -Properties id=FFmpegInteropX -Version %1 -Symbols -SymbolPackageFormat snupkg

‎Build-FFmpeg.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function Build-Platform {
312312
Write-Host "Building FFmpeg..."
313313
Write-Host
314314

315-
invoke $BashExe --login -x $SolutionDir\FFmpegConfig.sh $WindowsTarget $Platform $SharedOrStatic
315+
invoke $BashExe --login -x $SolutionDir\Build\FFmpegConfig.sh $WindowsTarget $Platform $SharedOrStatic
316316

317317
# Copy PDBs to built binaries dir
318318
Get-ChildItem -Recurse -Include '*.pdb' $build\int\ffmpeg\ | Copy-Item -Destination $target\bin\ -Force
@@ -383,7 +383,7 @@ if (!(Test-Path $BashExe)) {
383383
choice /c YN /m "Do you want to install MSYS2 now to C:\msys64?"
384384
if ($LASTEXITCODE -eq 1)
385385
{
386-
.\InstallTools.ps1 MSYS2
386+
.\Build\InstallTools.ps1 MSYS2
387387
$BashExe = "C:\msys64\usr\bin\bash.exe"
388388
if (!(Test-Path $BashExe)) {
389389
Exit 1
@@ -398,12 +398,12 @@ if (!(Test-Path $BashExe)) {
398398

399399
if (! (Test-Path "$PSScriptRoot\Tools\nasm")) {
400400
Write-Warning "NASM not found. Installing..."
401-
.\InstallTools.ps1 nasm
401+
.\Build\InstallTools.ps1 nasm
402402
}
403403

404404
if (! (Test-Path "$PSScriptRoot\Tools\perl")) {
405405
Write-Warning "Perl not found. Installing..."
406-
.\InstallTools.ps1 perl
406+
.\Build\InstallTools.ps1 perl
407407
}
408408

409409
[System.IO.DirectoryInfo] $vsLatestPath = `
@@ -538,7 +538,7 @@ else
538538

539539
if ($success -and $NugetPackageVersion)
540540
{
541-
nuget pack .\FFmpegInteropX.FFmpegUWP.nuspec `
541+
nuget pack .\Build\FFmpegInteropX.FFmpegUWP.nuspec `
542542
-Properties "id=FFmpegInteropX.FFmpegUWP;repositoryUrl=$FFmpegUrl;repositoryCommit=$FFmpegCommit;NoWarn=NU5128" `
543543
-Version $NugetPackageVersion `
544544
-Symbols -SymbolPackageFormat symbols.nupkg `

‎Build-FFmpegInteropX.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ param(
2222
10.0.17763.0
2323
10.0.18362.0
2424
#>
25-
[version] $WindowsTargetPlatformVersion = '10.0.18362.0',
25+
[version] $WindowsTargetPlatformVersion = '10.0.22000.0',
2626

2727
[ValidateSet('Debug', 'Release')]
2828
[string] $Configuration = 'Release',
@@ -78,15 +78,15 @@ function Build-Platform {
7878
Remove-Item -Force -Recurse -ErrorAction Ignore $SolutionDir\Output\FFmpegInterop\$Platform\*
7979
}
8080

81-
MSBuild.exe $SolutionDir\FFmpegInterop\FFmpegInterop.vcxproj `
81+
MSBuild.exe $SolutionDir\Source\FFmpegInteropX.vcxproj `
8282
/restore `
8383
/p:Configuration=$Configuration `
8484
/p:Platform=$Platform `
8585
/p:WindowsTargetPlatformVersion=$WindowsTargetPlatformVersion `
8686
/p:PlatformToolset=$PlatformToolset `
8787
/p:useenv=true
8888

89-
if ($lastexitcode -ne 0) { throw "Failed to build library FFmpegInterop.vcxproj." }
89+
if ($lastexitcode -ne 0) { throw "Failed to build library FFmpegInteropX.vcxproj." }
9090

9191
}
9292

@@ -124,7 +124,7 @@ $start = Get-Date
124124
$success = 1
125125

126126
# Restore nuget packets for solution
127-
nuget.exe restore ${PSScriptRoot}\FFmpegInterop.sln
127+
nuget.exe restore ${PSScriptRoot}\FFmpegInteropX.sln
128128

129129
foreach ($platform in $Platforms) {
130130

@@ -163,7 +163,7 @@ foreach ($platform in $Platforms) {
163163

164164
if ($success -and $NugetPackageVersion)
165165
{
166-
nuget pack .\FFmpegInteropX.nuspec `
166+
nuget pack .\Build\FFmpegInteropX.nuspec `
167167
-Properties "id=FFmpegInteropX;repositoryUrl=$FFmpegInteropXUrl;repositoryBranch=$FFmpegInteropXBranch;repositoryCommit=$FFmpegInteropXCommit;NoWarn=NU5128" `
168168
-Version $NugetPackageVersion `
169169
-Symbols -SymbolPackageFormat symbols.nupkg `

‎Build/AppVeyor_Build.bat

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
md Output\NuGet
2+
3+
nuget restore ..\FFmpegInteropX.sln
4+
5+
msbuild ..\FFmpegInteropX.sln /m /t:build /p:Configuration=Debug;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
6+
7+
msbuild ..\Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=x86;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
8+
9+
msbuild ..\Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=x64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
10+
11+
msbuild ..\Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=ARM;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
12+
13+
msbuild ..\Source\FFmpegInteropX.vcxproj /t:build /p:Configuration=Release;Platform=ARM64;AppxBundle=Never /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || exit
14+
15+
nuget pack FFmpegInteropX.nuspec -Properties id=FFmpegInteropX -Version %1 -Symbols -SymbolPackageFormat snupkg

‎FFmpegConfig.sh ‎Build/FFmpegConfig.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
2+
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
33

44
declare -A arch
55
arch['x86']='x86'

‎Build/FFmpegInteropX.FFmpegUWP.nuspec

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<description>FFmpeg dlls for Windows 10 UWP Apps</description>
7+
<authors>FFmpegInteropX</authors>
8+
<projectUrl>https://github.com/ffmpeginteropx/FFmpegInteropX</projectUrl>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="expression">LGPL-2.1-or-later AND Zlib AND MIT</license>
11+
<dependencies>
12+
<group targetFramework="uap10.0" />
13+
</dependencies>
14+
<repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
15+
</metadata>
16+
<files>
17+
18+
<file src="..\Output\FFmpegUWP\x64\licenses\*.*" target="licenses" />
19+
20+
<file src="..\Output\FFmpegUWP\x64\include\**\*.h" target="include" />
21+
22+
<file src="..\Output\FFmpegUWP\x86\bin\*.dll" target="runtimes\win10-x86\native" />
23+
<file src="..\Output\FFmpegUWP\x86\bin\*.pdb" target="runtimes\win10-x86\native" />
24+
<file src="..\Output\FFmpegUWP\x86\bin\*.lib" target="runtimes\win10-x86\native" />
25+
26+
<file src="..\Output\FFmpegUWP\x64\bin\*.dll" target="runtimes\win10-x64\native" />
27+
<file src="..\Output\FFmpegUWP\x64\bin\*.pdb" target="runtimes\win10-x64\native" />
28+
<file src="..\Output\FFmpegUWP\x64\bin\*.lib" target="runtimes\win10-x64\native" />
29+
30+
<file src="..\Output\FFmpegUWP\ARM\bin\*.dll" target="runtimes\win10-arm\native" />
31+
<file src="..\Output\FFmpegUWP\ARM\bin\*.pdb" target="runtimes\win10-arm\native" />
32+
<file src="..\Output\FFmpegUWP\ARM\bin\*.lib" target="runtimes\win10-arm\native" />
33+
34+
<file src="..\Output\FFmpegUWP\ARM64\bin\*.dll" target="runtimes\win10-arm64\native" />
35+
<file src="..\Output\FFmpegUWP\ARM64\bin\*.pdb" target="runtimes\win10-arm64\native" />
36+
<file src="..\Output\FFmpegUWP\ARM64\bin\*.lib" target="runtimes\win10-arm64\native" />
37+
38+
<file src="FFmpegInteropX.FFmpegUWP.targets" target="build\native"/>
39+
40+
</files>
41+
</package>

‎FFmpegInteropX.FFmpegUWP.targets ‎Build/FFmpegInteropX.FFmpegUWP.targets

File renamed without changes.

‎Build/FFmpegInteropX.nuspec

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<description>FFmpeg decoding library for Windows 10 UWP Apps</description>
7+
<authors>FFmpegInteropX</authors>
8+
<projectUrl>https://github.com/ffmpeginteropx/FFmpegInteropX</projectUrl>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="expression">Apache-2.0</license>
11+
<dependencies>
12+
<group>
13+
<dependency id="FFmpegInteropX.FFmpegUWP" version="5.0.0" />
14+
</group>
15+
<group targetFramework="uap10.0" />
16+
</dependencies>
17+
<repository type="git" url="$repositoryUrl$" branch="$repositoryBranch$" commit="$repositoryCommit$" />
18+
</metadata>
19+
<files>
20+
21+
<file src="..\Output\FFmpegInteropX\x64\Release\FFmpegInteropX.winmd" target="lib\uap10.0" />
22+
<file src="..\Output\FFmpegInteropX\x64\Release\FFmpegInteropX.xml" target="lib\uap10.0" />
23+
24+
<file src="..\Output\FFmpegInteropX\x86\Release\FFmpegInteropX.dll" target="runtimes\win10-x86\native" />
25+
<file src="..\Output\FFmpegInteropX\x86\Release\FFmpegInteropX.pdb" target="runtimes\win10-x86\native" />
26+
27+
<file src="..\Output\FFmpegInteropX\x64\Release\FFmpegInteropX.dll" target="runtimes\win10-x64\native" />
28+
<file src="..\Output\FFmpegInteropX\x64\Release\FFmpegInteropX.pdb" target="runtimes\win10-x64\native" />
29+
30+
<file src="..\Output\FFmpegInteropX\ARM\Release\FFmpegInteropX.dll" target="runtimes\win10-arm\native" />
31+
<file src="..\Output\FFmpegInteropX\ARM\Release\FFmpegInteropX.pdb" target="runtimes\win10-arm\native" />
32+
33+
<file src="..\Output\FFmpegInteropX\ARM64\Release\FFmpegInteropX.dll" target="runtimes\win10-arm64\native" />
34+
<file src="..\Output\FFmpegInteropX\ARM64\Release\FFmpegInteropX.pdb" target="runtimes\win10-arm64\native" />
35+
36+
<file src="FFmpegInteropX.targets" target="build\native"/>
37+
38+
</files>
39+
</package>

‎FFmpegInterop.pfx ‎Build/FFmpegInteropX.pfx

File renamed without changes.

‎FFmpegInteropX.targets ‎Build/FFmpegInteropX.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'UAP'">
4-
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\FFmpegInterop.winmd">
5-
<Implementation>FFmpegInterop.dll</Implementation>
4+
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\FFmpegInteropX.winmd">
5+
<Implementation>FFmpegInteropX.dll</Implementation>
66
</Reference>
77
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(PlatformTarget)\native\*.dll" />
88
</ItemGroup>

‎InstallTools.ps1 ‎Build/InstallTools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param(
88
# Stop on all PowerShell command errors
99
$ErrorActionPreference = "Stop"
1010

11-
New-Item -ItemType Directory -Path $PSScriptRoot\Tools -Force -OutVariable root
11+
New-Item -ItemType Directory -Path $PSScriptRoot\..\Tools -Force -OutVariable root
1212

1313
if ($Tools.Contains("MSYS2"))
1414
{

‎Repack-NuGet.ps1 ‎Build/Repack-NuGet.ps1

File renamed without changes.

‎Start-DevShell.ps1 ‎Build/Start-DevShell.ps1

File renamed without changes.

‎Docker/dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ RUN curl -SL --output git.zip https://github.com/git-for-windows/git/releases/do
2424
&& setx PATH "%PATH%;C:\git\cmd"
2525

2626
# Clone FFmpegInteropX
27-
RUN git clone https://github.com/ffmpeginteropx/FFmpegInteropX.git --recursive
27+
RUN git clone https://github.com/ffmpeginteropx/FFmpegInteropX.git --recursive -branch release-1.0
2828

2929
# Install build tools
3030
RUN cd FFmpegInteropX `
31-
&& powershell .\InstallTools.ps1 `
31+
&& powershell .\Build\InstallTools.ps1 `
3232
&& rd /S /Q C:\$Recycle.Bin
3333

3434
# Define the entry point for the docker container.

‎FFmpegInterop/AvEffectDefinition.h

-27
This file was deleted.

‎FFmpegInterop/CharacterEncoding.cpp

-10
This file was deleted.

‎FFmpegInterop/DirectXInteropHelper.h

-16
This file was deleted.

‎FFmpegInterop/Enumerations.h

-42
This file was deleted.

0 commit comments

Comments
 (0)