Commit Graph

2407 Commits

Author SHA1 Message Date
asvitkine
05444a235c Add GPLv2 notices to files from UAE Amiga Emulator, as retrieved from the
COPYING file of uae-0.8.29, retrieved from http://www.amigaemulator.org/
via uae-0.8.29.tar.bz2 (MD5 = 54abbabb5e8580b679c52de019141d61).
2012-03-30 01:25:46 +00:00
asvitkine
f8ddd3eccf Switch slirp to 3-clause BSD license. This change went in upstream to QEMU's
version of slirp (where this code comes from), with the following checkin:

commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec
Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Mon Jan 26 19:37:41 2009 +0000

    Remove the advertising clause from the slirp license

    According to the FSF, the 4-clause BSD license, which slirp is covered under,
    is not compatible with the GPL or LGPL[1].

    [1] http://www.fsf.org/licensing/licenses/index_html#GPLIncompatibleLicenses

    There are three declared copyright holders in slirp that use the 4-clause
    BSD license, the Regents of UC Berkley, Danny Gasparovski, and Kelly Price.
    Below are the appropriate permissions to remove the advertise clause from slirp
    from each party.

    Special thanks go to Richard Fontana from Red Hat for contacting all of the
    necessary authors to resolve this issue!

    Regents of UC Berkley:
    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

    July 22, 1999

    To All Licensees, Distributors of Any Version of BSD:

    As you know, certain of the Berkeley Software Distribution ("BSD") source
    code files require that further distributions of products containing all or
    portions of the software, acknowledge within their advertising materials
    that such products contain software developed by UC Berkeley and its
    contributors.

    Specifically, the provision reads:

    "     * 3. All advertising materials mentioning features or use of this software
          *    must display the following acknowledgement:
          *    This product includes software developed by the University of
          *    California, Berkeley and its contributors."

    Effective immediately, licensees and distributors are no longer required to
    include the acknowledgement within advertising materials.  Accordingly, the
    foregoing paragraph of those BSD Unix files containing it is hereby deleted
    in its entirety.

    William Hoskins
    Director, Office of Technology Licensing
    University of California, Berkeley

    Danny Gasparovski:

    Subject: RE: Slirp license
    Date: Thu, 8 Jan 2009 10:51:00 +1100
    From: "Gasparovski, Daniel" <Daniel.Gasparovski@ato.gov.au>
    To: "Richard Fontana" <rfontana@redhat.com>

    Hi Richard,

    I have no objection to having Slirp code in QEMU be licensed under the
    3-clause BSD license.

    Thanks for taking the effort to consult me about this.


    Dan ...

    Kelly Price:

    Date: Thu, 8 Jan 2009 19:38:56 -0500
    From: "Kelly Price" <strredwolf@gmail.com>
    To: "Richard Fontana" <rfontana@redhat.com>
    Subject: Re: Slirp license

    Thanks for contacting me, Richard.  I'm glad you were able to find
    Dan, as I've been "keeping the light on" for Slirp.  I have no use for
    it now, and I have little time for it (now holding onto Keenspot's
    Comic Genesis and having a regular US state government position). If
    Dan would like to return to the project, I'd love to give it back to
    him.

    As for copyright, I don't own all of it.  Dan does, so I will defer to
    him.  Any of my patches I will gladly license to the 3-part BSD
    license.  My interest in re-licensing was because we didn't have ready
    info to contact Dan.  If Dan would like to port Slirp back out of
    QEMU, a lot of us 64-bit users would be grateful.

    Feel free to share this email address with Dan.  I will be glad to
    effect a transfer of the project to him and Mr. Bellard of the QEMU
    project.

    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


    git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6451 c046a42c-6fe2-441c-8c8c-71466251a162
2012-03-30 01:10:28 +00:00
asvitkine
9325e35636 fix gamma code so that fades in Ferazel's Wand actually work 2012-03-28 03:30:49 +00:00
asvitkine
2676e1bd13 fix gamma fade code to make Ferazel's Wand launch 2012-03-27 03:43:28 +00:00
asvitkine
81ab1a3f6c another warning fix 2012-03-01 04:27:42 +00:00
asvitkine
c13fd620a1 fix some unused vars warnings 2012-03-01 04:25:10 +00:00
asvitkine
bad472294c fix a warning 2012-03-01 04:24:45 +00:00
asvitkine
62956816ed rename file_handle to mac_file_handle since file_handle is defined in system headers on some systems 2012-03-01 04:22:27 +00:00
asvitkine
e9b8dd6877 always use the version of the code that scans backward on x86 2012-03-01 04:15:59 +00:00
asvitkine
6badecc0da commit PPC testsuite docs from a web.archive.org cache of Gwenole's site 2012-02-12 16:56:48 +00:00
asvitkine
14355b28cd fix test-powerpc build 2012-02-12 16:41:28 +00:00
asvitkine
f964fdd22c Force tcp_input.c to be compiled with -O1 to workaround a compiler bug. 2012-02-11 02:03:36 +00:00
asvitkine
9c2b182d9a explicitly add /Library/Frameworks to framework search path 2012-01-18 23:58:31 +00:00
asvitkine
f84ed6a008 add LSMinimumSystemVersionByArchitecture to info plist 2012-01-15 23:28:29 +00:00
asvitkine
8ebf82224f tweaking compiler settings for 64-bit build 2012-01-15 23:26:52 +00:00
asvitkine
3024435dd0 change compiler options for better performance 2012-01-15 23:13:39 +00:00
asvitkine
93184352d4 fix some unused declaration warnings 2012-01-14 15:45:18 +00:00
asvitkine
3eb4344a98 prefer 32-bit over 64-bit on intel 2012-01-13 02:49:45 +00:00
asvitkine
172b7e6982 change sdk / macosx versions a bit 2012-01-06 23:43:10 +00:00
asvitkine
626306f902 add a script to change SDL framework's load path 2012-01-06 23:38:33 +00:00
asvitkine
447a06d9c3 include system frameworks in a standard way 2012-01-06 23:23:54 +00:00
asvitkine
e76ac8df89 fix Info.plist in xcode project 2012-01-05 23:28:00 +00:00
asvitkine
f989745171 copy SDL framework step 2012-01-04 23:12:54 +00:00
asvitkine
e0c86f12f9 autorelease fix has landed upstream to SDL, remove our version of it 2012-01-04 22:52:05 +00:00
asvitkine
3c693c0b8d add ppc build to xcode project 2012-01-02 00:03:37 +00:00
asvitkine
da96cfd110 separate kpx_cpu into separate xcode target 2012-01-01 23:46:28 +00:00
asvitkine
12b60bbdbb fix a warning 2012-01-01 23:24:26 +00:00
asvitkine
f68b4c1152 remove some code that was accidentally committed 2012-01-01 23:18:36 +00:00
asvitkine
c972658d81 cleanup ifdef chain syntax 2012-01-01 22:32:24 +00:00
asvitkine
60779756ab better cleanup of shared memory on failure 2012-01-01 19:11:31 +00:00
asvitkine
84a6ec3a05 wrap init_sdl() in USE_SDL ifdef 2012-01-01 18:51:40 +00:00
asvitkine
df4342b6db fix compile error introduced by my recent refactoring 2012-01-01 18:50:01 +00:00
asvitkine
2fb4e0aa4e make the ifdef chain more readable 2011-12-31 19:47:16 +00:00
asvitkine
1a2566b58e Fix CrashReporter poping up when PPC is not emulated on pre-10.5 systems. 2011-12-30 20:37:30 +00:00
asvitkine
78ea64bbd9 fix ppc build breakage 2011-12-30 17:38:39 +00:00
asvitkine
0604cce26b enable hardware cursor on SDL 1.2.15+ 2011-12-30 15:11:08 +00:00
asvitkine
4161b3d153 successfull built of x86 32/64 UB via xcode proj 2011-12-30 01:33:26 +00:00
asvitkine
dc0993ca6a trying to get xcode project to build a fat 32/64 bit binary - not yet there 2011-12-30 00:58:32 +00:00
asvitkine
d3ec12fc1c add utils_macosx.mm/h 2011-12-29 07:43:25 +00:00
asvitkine
dcf65b4d27 move NSAutoReleasePool_wrap() into its own file 2011-12-29 07:39:56 +00:00
asvitkine
c78c3046db refactor init_sdl() into a function 2011-12-28 23:33:04 +00:00
asvitkine
d58da945c6 refactor install_signal_handlers() into its own function 2011-12-28 23:30:25 +00:00
asvitkine
7930deea4d refactor load_mac_rom() into a function 2011-12-28 23:24:30 +00:00
asvitkine
cea73a29ed refactor get_system_info() into a function 2011-12-28 23:17:29 +00:00
asvitkine
57416ef7b4 add pre-generated config files for Xcode project
so far, only the x86-64 config
2011-12-28 22:38:03 +00:00
asvitkine
45fbd1523f fix SDL leak by wrapping video_refresh() call with an NSAutoReleasePool 2011-12-28 22:15:11 +00:00
asvitkine
cb0d1a818d revert r1.39 - SDL 1.2.14 doesn't fix the hardware cursor :\ 2011-12-28 21:44:53 +00:00
asvitkine
67ce6f2bcf re-enable hardware cursor switching for SDL 1.2.14+, since the bug appears
to have been fixed
2011-12-28 21:35:42 +00:00
asvitkine
3d09f85dc9 fix some unused var/function warnings 2011-12-28 20:22:25 +00:00
asvitkine
97c7aa5756 delete unused vars 2011-12-28 20:21:40 +00:00