Skip to content

Commit

Permalink
project: Fix License, License headers and Copyright information
Browse files Browse the repository at this point in the history
Fixes several files incorrectly stated a different license from the actual project, as well as the copyright headers included in all files. This change has no effect on the licensing terms, it should clear up a bit of confusion by contributors. Plus the files get a bit smaller, and we have less duplicated information across the entire project.

Overall the project is GPLv2 if not built with Qt, and GPLv3 if it is built with Qt. There are no parts licensed under a different license, all have been adapted from other compatible licenses into GPLv2 or GPLv3.
  • Loading branch information
Xaymar committed Apr 5, 2023
1 parent c9ff709 commit 5a3954a
Show file tree
Hide file tree
Showing 303 changed files with 1,053 additions and 4,013 deletions.
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2018-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

# Basic Formatting
TabWidth: 4
UseTab: ForContinuationAndIndentation
Expand Down
4 changes: 4 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2020-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

Checks: '-*,clang-diagnostic-*,clang-analyzer-*,readability-*,performance-*,portability-*,-portability-simd-intrinsics'
WarningsAsErrors: false
HeaderFilterRegex: ''
Expand Down
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2017-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

# top-most EditorConfig file
root = true

Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END
blank_issues_enabled: false
contact_links:
- name: Looking for Help & Support? (Discord-style)
Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END
---
name: "File an Feature or Improvement request"
title: "REPLACE ME"
Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END
---
name: "File an Bug or Crash report"
title: "REPLACE ME"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/authors.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

name: Authors
on: workflow_dispatch

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

name: Build

on:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2017-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

# CMAKE
/build
/build32
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2020-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

[submodule "cmake/clang"]
path = cmake/clang
url = https://github.com/Xaymar/cmake-clang.git
Expand Down
3 changes: 2 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ Michael Fabian 'Xaymar' Dirks <[email protected]> <[email protected]>
Vainock <[email protected]> <[email protected]>
Charles Fettinger <[email protected]> <[email protected]>
Charles Fettinger <[email protected]> <[email protected]>
Radegast-FFXIV <[email protected]> <[email protected]>
Radegast Stravinsky <[email protected]> <[email protected]>
Carsten Braun <[email protected]> <[email protected]>
24 changes: 8 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
# Copyright (C) 2017-2022 Michael Fabian Dirks
# Copyright (C) 2022 Romain Vigier
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2017-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# Copyright (C) 2019 Cat Stevens <[email protected]>
# Copyright (C) 2020 Brandon Edens <[email protected]>
# Copyright (C) 2021 Christopher P Yarger <[email protected]>
# Copyright (C) 2022 Carsten Braun <[email protected]>
# Copyright (C) 2022 Romain Vigier <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

# CMake Setup
cmake_minimum_required(VERSION 3.13...4.0)
Expand Down
4 changes: 3 additions & 1 deletion cmake/modules/FindAOM.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Copyright 2021 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END
#
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
#
Expand Down
4 changes: 3 additions & 1 deletion cmake/modules/FindFFmpeg.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2020-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END
#
# This module defines the following variables:
#
Expand All @@ -18,7 +21,6 @@
#
# <component> is the uppercase name of the component


find_package(PkgConfig QUIET)

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
Expand Down
4 changes: 4 additions & 0 deletions cmake/util.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2018-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

include(CMakeParseArguments)

Function(CacheSet Name Value)
Expand Down
4 changes: 4 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AUTOGENERATED COPYRIGHT HEADER START
# Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
# AUTOGENERATED COPYRIGHT HEADER END

files:
- source: /data/locale/en-US.ini
translation: /data/locale/%locale%.%file_extension%
4 changes: 4 additions & 0 deletions data/effects/blur/box-linear.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "common.effect"

// # Linear Optimization
Expand Down
4 changes: 4 additions & 0 deletions data/effects/blur/box.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "common.effect"

//------------------------------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion data/effects/blur/common.effect
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright 2021 Michael Fabian Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 4 additions & 0 deletions data/effects/blur/dual-filtering.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "common.effect"

//------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions data/effects/blur/gaussian-linear.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "common.effect"

// # Linear Optimization
Expand Down
4 changes: 4 additions & 0 deletions data/effects/blur/gaussian.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "common.effect"

//------------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion data/effects/channel-mask.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// -------------------------------------------------------------------------------- //
// Parameters
/// Provided by OBS Studio.
Expand Down Expand Up @@ -93,7 +97,6 @@ VertDataOut VSDefault(VertDataIn v_in)
// -------------------------------------------------------------------------------- //
// Channel Masking


float4 PSChannelMask(VertDataOut v_in) : TARGET
{
// Sample both inputs at current UV.
Expand Down
4 changes: 4 additions & 0 deletions data/effects/color-grade.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"

//------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions data/effects/color_conversion_rgb_hsl.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// This may have odd/incorrect results.

float3 RGBtoHSL(float3 rgb) {
Expand Down
4 changes: 4 additions & 0 deletions data/effects/color_conversion_rgb_hsv.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// Adapted from http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl

//#define RGB_HSV_FASTCONDITIONALMOVE
Expand Down
4 changes: 4 additions & 0 deletions data/effects/color_conversion_rgb_yuv.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#define YUV_709_ float3x3(0.2126, 0.7152, 0.0722, -0.2126, -0.7152, 0.9278, 0.7874, -0.7152, -0.0722)
#define YUV_709_NORM float3x3(0.2126, 0.7152, 0.0722, -0.1145721060573399, -0.3854278939426601, 0.5, 0.5, -0.4541529083058166, -0.0458470916941834)
#define YUV_709_INVNORM float3x3(1, 0, 1.5748, 1, -0.187324, -0.468124, 1, 1.8556, 0)
Expand Down
4 changes: 4 additions & 0 deletions data/effects/displace.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2017-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// Provided by OBS
uniform float4x4 ViewProj <
bool visible = false;
Expand Down
4 changes: 4 additions & 0 deletions data/effects/lut-consumer.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"
#include "lut.effect"

Expand Down
4 changes: 4 additions & 0 deletions data/effects/lut-producer.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"
#include "lut.effect"

Expand Down
4 changes: 4 additions & 0 deletions data/effects/lut.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

sampler_state __LUTSampler {
Filter = Linear;
AddressU = Clamp;
Expand Down
4 changes: 4 additions & 0 deletions data/effects/mask.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2018-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// Parameters
/// OBS
uniform float4x4 ViewProj;
Expand Down
4 changes: 4 additions & 0 deletions data/effects/mipgen.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2018-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

uniform float4x4 ViewProj;
uniform texture2d image;
uniform float2 imageTexel;
Expand Down
5 changes: 4 additions & 1 deletion data/effects/pack-unpack.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2020-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

uniform float4x4 ViewProj;
uniform texture2d image;
uniform int size;
Expand All @@ -19,7 +23,6 @@ VertData vertex_program(VertData vd)
return vd;
}


// -------------------------------------------------------------------------------- //
// Helpers
// -------------------------------------------------------------------------------- //
Expand Down
4 changes: 4 additions & 0 deletions data/effects/sdf/sdf-consumer.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// -------------------------------------------------------------------------------- //
// Defines
#define MAX_DISTANCE 65536.0
Expand Down
4 changes: 4 additions & 0 deletions data/effects/sdf/sdf-producer.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2019-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// 2D Signed Distance Field Generator
//
// This will produce an approximated Signed Distance Field on the fly.
Expand Down
4 changes: 4 additions & 0 deletions data/effects/shared.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

//------------------------------------------------------------------------------
// HLSL/GLSL Support
//------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions data/effects/standard.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"

uniform texture2d InputA<
Expand Down
4 changes: 4 additions & 0 deletions data/effects/transform.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"

uniform texture2d InputA<
Expand Down
4 changes: 4 additions & 0 deletions data/effects/virtual-greenscreen.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

#include "shared.effect"

uniform texture2d InputA<
Expand Down
4 changes: 3 additions & 1 deletion data/examples/shaders/base.effect
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright 2021 Michael Fabian Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 3 additions & 1 deletion data/examples/shaders/colorconversion_rgb_yuv.effect
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright 2021 Michael Fabian Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 4 additions & 0 deletions data/examples/shaders/feature-test.effect
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2020-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END

// --------------------------------------------------------------------------------
// Uniforms set by libobs
uniform float4x4 ViewProj<
Expand Down
4 changes: 3 additions & 1 deletion data/examples/shaders/filter/blur-gaussian.effect
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright 2021 Michael Fabian Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER START
// Copyright (C) 2021-2023 Michael Fabian 'Xaymar' Dirks <[email protected]>
// AUTOGENERATED COPYRIGHT HEADER END
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
Expand Down
Loading

0 comments on commit 5a3954a

Please sign in to comment.