Author: helmut-guest Date: 2013-11-22 11:15:49 +0000 (Fri, 22 Nov 2013) New Revision: 14665
Added: packages/trunk/jugglemaster/debian/patches/libav9.patch packages/trunk/jugglemaster/debian/patches/loadavg.patch Modified: packages/trunk/jugglemaster/debian/changelog packages/trunk/jugglemaster/debian/patches/series Log: jugglemaster: acknowledge NMUs Modified: packages/trunk/jugglemaster/debian/changelog =================================================================== --- packages/trunk/jugglemaster/debian/changelog 2013-11-09 14:28:00 UTC (rev 14664) +++ packages/trunk/jugglemaster/debian/changelog 2013-11-22 11:15:49 UTC (rev 14665) @@ -6,12 +6,31 @@ * Fix Vcs-Browser value after alioth changes. * Build hardening. * Mark packages as Multi-Arch: foreign. + * Acknowledge NMUs. Thanks to Sebastian Ramacher for taking care of urgent + RC bugs and Moritz Muehlenhoff for providing a patch. [ Evgeni Golov ] * Correct Vcs-* URLs to point to anonscm.debian.org -- Helmut Grohne <[email protected]> Sat, 06 Jul 2013 16:23:00 +0200 +jugglemaster (0.4-6.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/loadavg.patch: kfreebsd-* defines struct loadavg in some + system header. Rename aajm's loadavg to resolve this conflict. (Closes: + #722493) + + -- Sebastian Ramacher <[email protected]> Sat, 14 Sep 2013 18:58:28 +0200 + +jugglemaster (0.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/libav9.patch: Fix build with libav 9. Thanks to Moritz + Muehlenhoff for the patch. (Closes: #720823) + + -- Sebastian Ramacher <[email protected]> Tue, 03 Sep 2013 01:13:50 +0200 + jugglemaster (0.4-6) unstable; urgency=low * Fix "[aajm] Broken pronoun "It" (JuggleMaster) in extended Added: packages/trunk/jugglemaster/debian/patches/libav9.patch =================================================================== --- packages/trunk/jugglemaster/debian/patches/libav9.patch (rev 0) +++ packages/trunk/jugglemaster/debian/patches/libav9.patch 2013-11-22 11:15:49 UTC (rev 14665) @@ -0,0 +1,34 @@ +Description: Fix build with libav 9 +Author: Moritz Muehlenhoff <[email protected]> +Bug-Debian: http://bugs.debian.org/720823 +Last-Update: 2013-09-03 + +diff -aur jugglemaster-0.4.orig/src/jmdlx/print.cpp jugglemaster-0.4/src/jmdlx/print.cpp +--- jugglemaster-0.4.orig/src/jmdlx/print.cpp 2013-07-23 10:02:49.000000000 +0200 ++++ jugglemaster-0.4/src/jmdlx/print.cpp 2013-07-23 10:12:46.192000000 +0200 +@@ -544,7 +544,6 @@ + outputfile = fopen((const char *)filename->GetValue().mb_str(wxConvUTF8),"w"); + if(outputfile == NULL) return 1; + +- avcodec_init(); + avcodec_register_all(); + + codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); +@@ -552,7 +551,7 @@ + return(1); + } + +- c= avcodec_alloc_context(); ++ c= avcodec_alloc_context3(codec); + picture= avcodec_alloc_frame(); + + c->bit_rate = 400000; +@@ -565,7 +564,7 @@ + c->max_b_frames=1; + c->pix_fmt = PIX_FMT_YUV420P; + +- if (avcodec_open(c, codec) < 0) { ++ if (avcodec_open2(c, codec, NULL) < 0) { + return(1); + } + Added: packages/trunk/jugglemaster/debian/patches/loadavg.patch =================================================================== --- packages/trunk/jugglemaster/debian/patches/loadavg.patch (rev 0) +++ packages/trunk/jugglemaster/debian/patches/loadavg.patch 2013-11-22 11:15:49 UTC (rev 14665) @@ -0,0 +1,55 @@ +Description: Rename loadavg to aajm_loadavg + On kfreebsd-*, there is a struct loadavg in some system header. Rename aajm's + loadavg to no conflict with the definition in the system header. +Author: Sebastian Ramacher <[email protected]> +Last-Update: 2013-09-11 + +--- jugglemaster-0.4.orig/src/aajm/aajm.cpp ++++ jugglemaster-0.4/src/aajm/aajm.cpp +@@ -24,7 +24,7 @@ void errorCB(char* msg) { + void draw_juggler(int show_loadavg) { + int color; + int i; +- struct loadavg load; ++ struct aajm_loadavg load; + + arm* ap = &(jmlib->ap); + ball* rhand = &(jmlib->rhand); +@@ -101,7 +101,7 @@ void draw_juggler(int show_loadavg) { + runnable number of process at any given moment in time. + If load average is greater than your number of processors, then your + system has more work to do than it's capable of doing. */ +-void loadaverage(struct loadavg *load) { ++void loadaverage(struct aajm_loadavg *load) { + FILE *loadf; + + loadf = fopen("/proc/loadavg", "r"); +@@ -156,7 +156,7 @@ void resizehandler(aa_context *resized_c + void main_loop(int max_iterations, int delay, + int loadavg_flag, int normal_load, int socket_fd) { + struct timeval starttime, endtime, selecttime; +- struct loadavg load; ++ struct aajm_loadavg load; + long speed = DEFSPEED; /* microseconds between frames */ + long load_speed = 0; /* Speed adjustment, based on load */ + int loop_forever = 0; +--- jugglemaster-0.4.orig/src/aajm/aajm.h ++++ jugglemaster-0.4/src/aajm/aajm.h +@@ -40,7 +40,7 @@ aa_context *context; + aa_renderparams *params; + JMLib* jmlib; + +-struct loadavg { ++struct aajm_loadavg { + float one, five, fifteen; + }; + +@@ -51,7 +51,7 @@ struct loadavg { + + void errorCB(char* msg); + void draw_juggler(int show_loadavg); +-void loadaverage(struct loadavg *load); ++void loadaverage(struct aajm_loadavg *load); + int startlistening(int port); + void stoplistening(int fd); + void resizehandler(aa_context *resized_context); Modified: packages/trunk/jugglemaster/debian/patches/series =================================================================== --- packages/trunk/jugglemaster/debian/patches/series 2013-11-09 14:28:00 UTC (rev 14664) +++ packages/trunk/jugglemaster/debian/patches/series 2013-11-22 11:15:49 UTC (rev 14665) @@ -9,3 +9,5 @@ fix-memory-zeroing.patch wx28-compatibility.patch ld-as-needed.patch +libav9.patch +loadavg.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
