Author Topic: Mupen64Plus-AE now mirrors upstream Mupen64Plus  (Read 2807 times)

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Mupen64Plus-AE now mirrors upstream Mupen64Plus
« on: January 10, 2015, 08:48:56 PM »
At long last.  The day has finally come.

Mupen64Plus-AE now uses 100% standard implementation for all Mupen64Plus plugins.
 - mupen64plus-audio-sdl
 - mupen64plus-core
 - mupen64plus-rsp-hle
 - mupen64plus-ui-console
 - mupen64plus-video-glide64mk2
 - mupen64plus-video-rice

Mupen64Plus-AE maintains additional plugins that aren't in upstream
 - mupen64plus-input-android
 - mupen64plus-video-gln64

And for those keeping track, Mupen64Plus-AE uses SDL release-2.0.0, with one line of code changed.
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Re: Mupen64Plus-AE now mirrors upstream Mupen64Plus
« Reply #1 on: January 10, 2015, 09:12:33 PM »
Devs: We are now using a strict one-way sync policy for all plugins that are maintained upstream.  This means:
  • Plugins in the master branch of mupen64plus-ae will always mirror a specific commit in the upstream repository.
  • All fixes and enhancements to plugins maintained upstream should be made by submitting a pull request to upstream.
  • After the upstream pull request is merged, the changes will be mirrored downstream.
  • Any manual edits to the plugins (whether intentional or not) on mupen64plus-ae/master will be overwritten at next sync.
  • For testing and prototyping, feel free to manually edit the plugins on the downstream side, as long as you do it in a branch that will not be merged back to master.

Synchronization is handled via a script, which devs should read if they plan to tinker with any of the upstream plugins.
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version