rpms/squeak-vm/devel squeak-vm-dprintf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 squeak-vm.spec, 1.2, 1.3

[Gavin Romig-Koch]

Author: gavin

Update of /cvs/pkgs/rpms/squeak-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13966

Modified Files:
	.cvsignore sources squeak-vm.spec 
Added Files:
	squeak-vm-dprintf.patch 
Log Message:
  - upgrade to new upstream
  - work around dprintf problem
  - UUID lib now in libuuid-devel (moved from e2fsprogs-devel)


squeak-vm-dprintf.patch:
 plugins/MIDIPlugin/sqUnixMIDIALSA.inc     |   22 ++++++++++++----------
 vm-display-fbdev/sqUnixFBDev.c            |   13 ++++---------
 vm-display-fbdev/sqUnixFBDevFramebuffer.c |    2 +-
 vm/debug.c                                |    3 ++-
 4 files changed, 19 insertions(+), 21 deletions(-)

--- NEW FILE squeak-vm-dprintf.patch ---
diff -up Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.dprintf Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc
--- Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc.dprintf	2007-03-11 19:56:13.000000000 -0400
+++ Squeak-3.10-5/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc	2009-07-20 22:44:53.000000000 -0400
@@ -33,6 +33,8 @@
  * Last edited: 2007-03-11 14:17:34 by piumarta on emilia.local
  */
 
+#include "debug.h"
+
 /*** MIDI Parameters (used with sqMIDIParameter function) ***/
 
 /* TODO: Why is this not in Cross/plugins/MIDIPlugin/MIDIPlugin.h ??? */
@@ -184,7 +186,7 @@ int sqMIDIClosePort(int portNum)
 */
 int sqMIDIGetClock(void)
 {
-  dprintf("sqMIDIGetClock\n");
+  dprintf(("sqMIDIGetClock\n"));
   success(false);
   return 0;
 }
@@ -196,7 +198,7 @@ int sqMIDIGetClock(void)
 */
 int sqMIDIGetPortCount(void)
 {
-  dprintf("sqMIDIGetPortCount\n");
+  dprintf(("sqMIDIGetPortCount\n"));
   success(true);
   return 1;
 }
@@ -244,7 +246,7 @@ int sqMIDIGetPortName(int portNum, int n
 */
 int sqMIDIOpenPort(int portNum, int readSemaIndex, int interfaceClockRate)
 {
-  dprintf("sqMIDIOpenPort(%d, %d, %d)\n", portNum, readSemaIndex, interfaceClockRate);
+  dprintf(("sqMIDIOpenPort(%d, %d, %d)\n", portNum, readSemaIndex, interfaceClockRate));
   int type= SND_SEQ_PORT_TYPE_APPLICATION;
 
   switch (portNum)
@@ -406,7 +408,7 @@ int sqMIDIParameter(int whichParameter, 
 */
 int sqMIDIPortReadInto(int portNum, int count, int bufferPtr)
 {
-  dprintf("sqMIDIPortRead\n");
+  dprintf(("sqMIDIPortRead\n"));
   success(false);
   return 0;
 }
@@ -426,9 +428,9 @@ int sqMIDIPortWriteFromAt(int portNum, i
       snd_seq_event_t ev;
       unsigned char *bytePtr= (unsigned char *)bufferPtr;
 
-      dprintf("Port %d Write:", portNum);
-      for (i= 0;  i < count;  ++i) dprintf(" %d", (int)bytePtr[i]);
-      dprintf(" at %d\n", time);
+      dprintf(("Port %d Write:", portNum));
+      for (i= 0;  i < count;  ++i) dprintf((" %d", (int)bytePtr[i]));
+      dprintf((" at %d\n", time));
       
       snd_seq_ev_clear(&ev);
       snd_seq_ev_set_source(&ev, out_port);
@@ -483,7 +485,7 @@ int sqMIDIParameterGet(int whichParamete
 
 int midiShutdown(void)
 {
-  dprintf("midiShutdown\n");
+  dprintf(("midiShutdown\n"));
   success(false);
   return 0;
 }
@@ -496,12 +498,12 @@ static void performMIDICmd(snd_seq_event
   switch (cmd)
     {
     case 128:	/* note off */
-      dprintf("Note off %d, %d\n", ch, arg1);
+      dprintf(("Note off %d, %d\n", ch, arg1));
       snd_seq_ev_set_noteoff(ev, ch, arg1, 0);
       break;
 
     case 144:	/* note on */
-      dprintf("Note on %d, %d, %d\n", ch, arg1, arg2);
+      dprintf(("Note on %d, %d, %d\n", ch, arg1, arg2));
       snd_seq_ev_set_noteon(ev, ch, arg1, arg2);
       break;
 
diff -up Squeak-3.10-5/platforms/unix/vm/debug.c.dprintf Squeak-3.10-5/platforms/unix/vm/debug.c
--- Squeak-3.10-5/platforms/unix/vm/debug.c.dprintf	2006-09-14 13:52:28.000000000 -0400
+++ Squeak-3.10-5/platforms/unix/vm/debug.c	2009-07-20 22:45:00.000000000 -0400
@@ -1,9 +1,10 @@
-#include "debug.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 
+#include "debug.h"
+
 void __sq_dprintf(const char *fmt, ...)
 {
   va_list ap;
diff -up Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c.dprintf Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
--- Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c.dprintf	2009-04-29 12:32:52.000000000 -0400
+++ Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDev.c	2009-07-20 22:45:05.000000000 -0400
@@ -67,16 +67,11 @@
 # define DEBUG	0
 #endif
 
-
-static void dprintf(const char *fmt, ...)
-{
-#if (DEBUG)
-  va_list ap;
-  va_start(ap, fmt);
-  vprintf(fmt, ap);
-  va_end(ap);
+#ifdef DEBUG
+# define dprintf printf
+#else
+  static void dprintf(char *fmt, ...) {}
 #endif
-}
 
 static void fatalError(const char *who)
 {
diff -up Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c.dprintf Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c
--- Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c.dprintf	2006-10-18 13:03:56.000000000 -0400
+++ Squeak-3.10-5/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c	2009-07-20 22:45:11.000000000 -0400
@@ -508,7 +508,7 @@ static void fb_initVisual(_self)
   self->size= fb_height(self) * self->fix.line_length;
   self->pitch= self->fix.line_length / self->var.bits_per_pixel * 8;
 
-  dprintf("%s: %dx%dx%d+%x+%x (%dx%d) %s, rgb %d+%d %d+%d %d+%d pitch %d(%d)\n", self->fbName,
+  dprintf("%s: %dx%dx%d+%x+%x (%dx%d) %s, rgb %d+%d %d+%d %d+%d pitch %d(%ld)\n", self->fbName,
 	  self->var.xres, self->var.yres, self->var.bits_per_pixel, self->var.xoffset, self->var.yoffset,
 	  self->var.xres_virtual, self->var.yres_virtual,
 	  visualName(self),


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2009 01:49:29 -0000	1.2
+++ .cvsignore	21 Jul 2009 04:12:24 -0000	1.3
@@ -1,2 +1,2 @@
-Squeak-3.10-4.src.tar.gz
+Squeak-3.10-5.src.tar.gz
 squeak-desktop-files.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2009 01:49:29 -0000	1.2
+++ sources	21 Jul 2009 04:12:24 -0000	1.3
@@ -1,2 +1,2 @@
-bd8c32860d7e80540a497149a387a898  Squeak-3.10-4.src.tar.gz
+27d56539f051b19c73517cad72dd217d  Squeak-3.10-5.src.tar.gz
 9cdcd2067b498c217f1a1131dc1356a3  squeak-desktop-files.tar.gz


Index: squeak-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/devel/squeak-vm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squeak-vm.spec	26 Feb 2009 02:40:59 -0000	1.2
+++ squeak-vm.spec	21 Jul 2009 04:12:24 -0000	1.3
@@ -1,11 +1,11 @@
 %define major   3.10
-%define minor   4
+%define minor   5
 %define vmver   %{major}-%{minor}
 %define source  Squeak-%{vmver}
 
 Name:           squeak-vm
 Version:        %{major}.%{minor}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        The Squeak virtual machine
 
 Group:          Development/Languages
@@ -17,6 +17,7 @@ Patch0:         squeak-vm-rpath.patch
 Patch1:         squeak-vm-install-inisqueak.patch
 Patch2:         squeak-vm-imgdir.patch
 Patch3:         squeak-vm-tail-options.patch
+Patch4:         squeak-vm-dprintf.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): shared-mime-info
@@ -37,7 +38,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  libuuid-devel
 
 #
 # define nonXOplugins to be non-zero if you would like the plugins that 
@@ -85,6 +86,7 @@ find platforms -name '*.[ch]' -exec chmo
 %patch1 -p1 -b .install-inisqueak
 %patch2 -p1 -b .imgdir
 %patch3 -p1 -b .tail-options
+%patch4 -p1 -b .dprintf
 
 %build
 mkdir -p bld
@@ -160,7 +162,6 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/squeak/%{vmver}/PseudoTTYPlugin
 %{_libdir}/squeak/%{vmver}/UnixOSProcessPlugin
 %{_libdir}/squeak/%{vmver}/XDisplayControlPlugin
-%{_libdir}/squeak/%{vmver}/Mpeg3Plugin
 %ifarch i686
 %{_libdir}/squeak/%{vmver}/SqueakFFIPrims
 %endif
@@ -181,6 +182,7 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/squeak/%{vmver}/Squeak3D
 %{_libdir}/squeak/%{vmver}/UUIDPlugin
 %{_libdir}/squeak/%{vmver}/VideoForLinuxPlugin
+%{_libdir}/squeak/%{vmver}/HostWindowPlugin
 
 %{_libdir}/squeak/%{vmver}/SqueakV3.sources
 %{_libdir}/squeak/%{vmver}/SqueakV39.sources
@@ -210,13 +212,16 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/squeak/%{vmver}/PseudoTTYPlugin
 %{_libdir}/squeak/%{vmver}/UnixOSProcessPlugin
 %{_libdir}/squeak/%{vmver}/XDisplayControlPlugin
-%{_libdir}/squeak/%{vmver}/Mpeg3Plugin
 %ifarch %{ix86} ppc
 %{_libdir}/squeak/%{vmver}/SqueakFFIPrims
 %endif
 %endif
 
 %changelog
+* Mon Jul 20 2009 Gavin Romig-Koch <gavin at redhat.com> - 3.10.5-1
+  - upgrade to new upstream
+  - work around dprintf problem
+  - UUID lib now in libuuid-devel (moved from e2fsprogs-devel) 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild