From 52b33817c0e85003e5d7fe6535b5ee17ebce5d95 Mon Sep 17 00:00:00 2001 From: thfrwn <11335318+rfht@users.noreply.github.com> Date: Thu, 13 Sep 2018 17:54:46 -0700 Subject: [PATCH] add licenses to external source code in README; add GPLv2+ to Jon's code referenced in that section --- README | 28 ++++++++++++++-------------- src/aviwriter/avi.h | 18 ++++++++++++++++++ src/aviwriter/avi_rw_iobuf.cpp | 17 +++++++++++++++++ src/aviwriter/avi_rw_iobuf.h | 17 +++++++++++++++++ src/aviwriter/avi_writer.cpp | 17 +++++++++++++++++ src/aviwriter/avi_writer.h | 18 ++++++++++++++++++ src/aviwriter/guid.cpp | 17 +++++++++++++++++ src/aviwriter/guid.h | 17 +++++++++++++++++ src/aviwriter/ksdataformat.cpp | 17 +++++++++++++++++ src/aviwriter/ksdataformat.h | 17 +++++++++++++++++ src/aviwriter/riff.cpp | 17 +++++++++++++++++ src/aviwriter/riff.h | 17 +++++++++++++++++ src/aviwriter/riff_wav_writer.cpp | 17 +++++++++++++++++ src/aviwriter/riff_wav_writer.h | 17 +++++++++++++++++ src/hardware/vga_pc98_cg.cpp | 17 +++++++++++++++++ src/hardware/vga_pc98_crtc.cpp | 17 +++++++++++++++++ src/hardware/vga_pc98_dac.cpp | 17 +++++++++++++++++ src/hardware/vga_pc98_egc.cpp | 17 +++++++++++++++++ src/hardware/vga_pc98_gdc.cpp | 17 +++++++++++++++++ 19 files changed, 322 insertions(+), 14 deletions(-) diff --git a/README b/README index b3f59fc2c..bd3797b26 100644 --- a/README +++ b/README @@ -553,18 +553,18 @@ This is my attempt to properly credit the code and it's sources below. Feel free to revise and correct this list if there are errors. -NE2000 network card emulation (Bochs) +NE2000 network card emulation (Bochs; LGPLv2+) src/hardware/ne2000.cpp -MT32 synthesizer (MUNT) +MT32 synthesizer (MUNT; LGPLv2.1+) src/mt32/*.cpp src/mt32/*.h -AVI writer with OpenDML support (written by myself) +AVI writer with OpenDML support (written by myself; GPLv2+) src/aviwriter/*.cpp src/aviwriter/*.h -Framework-agnostic GUI toolkit (Jorg Walter) +Framework-agnostic GUI toolkit (Jorg Walter; GPLv3+) src/libs/gui_tk/*.cpp src/libs/gui_tk/*.h @@ -572,36 +572,36 @@ Porttalk library, to read/write I/O ports directly (Unknown source) src/libs/porttalk/*.cpp src/libs/porttalk/*.h -FreeDOS utilities as binary blobs (FreeDOS) +FreeDOS utilities as binary blobs (FreeDOS; no license) src/builtin/*.cpp -NukedOPL OPL3 emulation (Alexey Khokholov) +NukedOPL OPL3 emulation (Alexey Khokholov; GPLv2+) src/hardware/nukedopl.cpp -OPL emulation based on Ken Silverman OPL2 emulation +OPL emulation based on Ken Silverman OPL2 emulation (LGPLv2.1+) src/hardware/opl.cpp -MOS6581 SID emulation +MOS6581 SID emulation (GPLv2+) src/hardware/reSID/*.cpp src/hardware/reSID/*.h -SN76496 emulation (MAME project) +SN76496 emulation (MAME project; GPLv2+) src/hardware/sn76496.h src/hardware/tandy_sound.cpp -PC-98 video rendering and I/O handling code (written by myself) +PC-98 video rendering and I/O handling code (written by myself; GPLv2+) src/hardware/vga_pc98*.cpp -3dfx Voodoo Graphics SST-1/2 emulation (Aaron Giles) +3dfx Voodoo Graphics SST-1/2 emulation (Aaron Giles; BSD 3-clause) src/hardware/voodoo_emu.cpp -PC-98 FM board emulation (Neko Project II) +PC-98 FM board emulation (Neko Project II; no license) src/hardware/snd_pc98/* -QCOW image support (Michael Greger) +QCOW image support (Michael Greger; GPLv2+) src/ints/qcow2_disk.cpp -HQ2X and HQ3X render scaler (ScummVM, Maxim Stepin) +HQ2X and HQ3X render scaler (ScummVM, Maxim Stepin; GPLv2+) src/gui/render_templates_hq2x.h diff --git a/src/aviwriter/avi.h b/src/aviwriter/avi.h index aaf8e12a2..4d3924876 100644 --- a/src/aviwriter/avi.h +++ b/src/aviwriter/avi.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + #ifndef __VIDEOMGR_UTIL_AVI_H #define __VIDEOMGR_UTIL_AVI_H diff --git a/src/aviwriter/avi_rw_iobuf.cpp b/src/aviwriter/avi_rw_iobuf.cpp index ef877c378..6c5df2699 100644 --- a/src/aviwriter/avi_rw_iobuf.cpp +++ b/src/aviwriter/avi_rw_iobuf.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include #include diff --git a/src/aviwriter/avi_rw_iobuf.h b/src/aviwriter/avi_rw_iobuf.h index 2c8b3a2c8..05fe0961f 100644 --- a/src/aviwriter/avi_rw_iobuf.h +++ b/src/aviwriter/avi_rw_iobuf.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ extern unsigned char* avi_io_buf; extern unsigned char* avi_io_read; diff --git a/src/aviwriter/avi_writer.cpp b/src/aviwriter/avi_writer.cpp index 8df8a475e..b264e0702 100644 --- a/src/aviwriter/avi_writer.cpp +++ b/src/aviwriter/avi_writer.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ /* Shut up! */ #define _CRT_NONSTDC_NO_DEPRECATE diff --git a/src/aviwriter/avi_writer.h b/src/aviwriter/avi_writer.h index 8028c85ae..eda29a512 100644 --- a/src/aviwriter/avi_writer.h +++ b/src/aviwriter/avi_writer.h @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + #ifndef __ISP_UTILS_AVI_WRITER_H #define __ISP_UTILS_AVI_WRITER_H diff --git a/src/aviwriter/guid.cpp b/src/aviwriter/guid.cpp index 83d9ebcf4..e5c917ad8 100644 --- a/src/aviwriter/guid.cpp +++ b/src/aviwriter/guid.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include #include diff --git a/src/aviwriter/guid.h b/src/aviwriter/guid.h index 7fd511590..db7eee059 100644 --- a/src/aviwriter/guid.h +++ b/src/aviwriter/guid.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #ifndef __ISP_UTILS_V4_GUID_H #define __ISP_UTILS_V4_GUID_H diff --git a/src/aviwriter/ksdataformat.cpp b/src/aviwriter/ksdataformat.cpp index 9d92c46a6..3c3897e05 100644 --- a/src/aviwriter/ksdataformat.cpp +++ b/src/aviwriter/ksdataformat.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "ksdataformat.h" diff --git a/src/aviwriter/ksdataformat.h b/src/aviwriter/ksdataformat.h index 949ce88d5..eb81b3e1b 100644 --- a/src/aviwriter/ksdataformat.h +++ b/src/aviwriter/ksdataformat.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #ifndef _ISP_UTILS_V4_WIN_KSDATAFORMAT_H_H #define _ISP_UTILS_V4_WIN_KSDATAFORMAT_H_H diff --git a/src/aviwriter/riff.cpp b/src/aviwriter/riff.cpp index 6bebc8dfc..e6bb613c0 100644 --- a/src/aviwriter/riff.cpp +++ b/src/aviwriter/riff.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ /* Shut up! */ #define _CRT_NONSTDC_NO_DEPRECATE diff --git a/src/aviwriter/riff.h b/src/aviwriter/riff.h index b2f6a1797..867ad4d60 100644 --- a/src/aviwriter/riff.h +++ b/src/aviwriter/riff.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #ifndef __VIDEOMGRUTIL_RIFF_H #define __VIDEOMGRUTIL_RIFF_H diff --git a/src/aviwriter/riff_wav_writer.cpp b/src/aviwriter/riff_wav_writer.cpp index e3ec2811b..7124b6879 100644 --- a/src/aviwriter/riff_wav_writer.cpp +++ b/src/aviwriter/riff_wav_writer.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ /* Shut up! */ #define _CRT_NONSTDC_NO_DEPRECATE diff --git a/src/aviwriter/riff_wav_writer.h b/src/aviwriter/riff_wav_writer.h index 1824f9118..ed025e503 100644 --- a/src/aviwriter/riff_wav_writer.h +++ b/src/aviwriter/riff_wav_writer.h @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #ifndef __ISP_UTILS_V4_AVI_RIFF_WAV_WRITER_H #define __ISP_UTILS_V4_AVI_RIFF_WAV_WRITER_H diff --git a/src/hardware/vga_pc98_cg.cpp b/src/hardware/vga_pc98_cg.cpp index bd3f2bb9b..676c9445c 100644 --- a/src/hardware/vga_pc98_cg.cpp +++ b/src/hardware/vga_pc98_cg.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "dosbox.h" #include "setup.h" diff --git a/src/hardware/vga_pc98_crtc.cpp b/src/hardware/vga_pc98_crtc.cpp index 2280ba6db..bf2c147c3 100644 --- a/src/hardware/vga_pc98_crtc.cpp +++ b/src/hardware/vga_pc98_crtc.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "dosbox.h" #include "setup.h" diff --git a/src/hardware/vga_pc98_dac.cpp b/src/hardware/vga_pc98_dac.cpp index d3c0aaba2..2bc554bc6 100644 --- a/src/hardware/vga_pc98_dac.cpp +++ b/src/hardware/vga_pc98_dac.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "dosbox.h" #include "setup.h" diff --git a/src/hardware/vga_pc98_egc.cpp b/src/hardware/vga_pc98_egc.cpp index c25b4f0dc..e830a8399 100644 --- a/src/hardware/vga_pc98_egc.cpp +++ b/src/hardware/vga_pc98_egc.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "dosbox.h" #include "setup.h" diff --git a/src/hardware/vga_pc98_gdc.cpp b/src/hardware/vga_pc98_gdc.cpp index d4863d2a8..9810a0b16 100644 --- a/src/hardware/vga_pc98_gdc.cpp +++ b/src/hardware/vga_pc98_gdc.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Jon Campbell + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "dosbox.h" #include "setup.h"