Packman Build Service PMBS

Changes of Revision 2

gnaural.spec Changed

@@ -22,8 +22,10 @@
 Summary:        An opensource binaural-beat generator
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Utilities
+ExclusiveArch:  x86_64
 Url:            http://gnaural.sourceforge.net
 Source0:        http://downloads.sourceforge.net/project/gnaural/Gnaural/%{name}-%{version}.tar.gz
+Patch0:         gnaural.patch
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  portaudio-devel
@@ -33,8 +35,8 @@
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
-Provides:       %{name}2 = %{version}
-Obsoletes:      %{name}2 < %{version}
+Provides:       %{name}2 = %{version}-%{release}
+Obsoletes:      %{name}2 < %{version}-%{release}
 
 %description
 Gnaural is an audio synthesizer intended for use as a binaural beat
@@ -45,15 +47,12 @@
 frequencies, as well as in their volume and stereo positioning.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-# add -fgnu89-inline flag to build with gcc5
-%if 0%{?suse_version} > 1320	
-export CFLAGS="%{optflags} -fgnu89-inline"
-%endif
+CFLAGS='%{optflags} -fgnu89-inline -Wno-deprecated-declarations'
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install INSTALL="install -p"
@@ -69,18 +68,14 @@
 %fdupes -s %{buildroot}%{_datadir}
 
 %post
-%if 0%{?suse_version} >= 1140	
 %icon_theme_cache_post
-%endif
 
 %postun
-%if 0%{?suse_version} >= 1140
 %icon_theme_cache_postun
-%endif
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc README
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.xpm

gnaural.patch Added

@@ -0,0 +1,86 @@
+--- a/src/BinauralBeat.h
++++ b/src/BinauralBeat.h
+@@ -166,7 +166,7 @@ int BB_SetupVoice (int VoiceID, // Array
+                    int mute,    //TRUE or FALSE
+                    int mono,    //TRUE or FALSE [added 20100614]
+                    int NumberOfEvents); //how many events in your array
+-void (*BB_UserFunc) (int voice);
++extern void (*BB_UserFunc) (int voice);
+ void BB_Water (int voice, short *array, int arraylen, float Lowcut);
+ short *BB_WaterInit (int arraylen, float pitch);
+ void BB_WaterVoiceInit (int voice);
+--- a/src/gnauralXML.c
++++ b/src/gnauralXML.c
+@@ -216,7 +216,7 @@ int gxml_XMLEventDataParser (const gchar
+  {
+   //must add 1, because 0 would look to Restore() like a NULL pointer:
+   SG_UndoRedo.DPdata[internal_EntryCount].parent =
+-   (void *) (atoi (Value) + 1);
++   (void *) (atol (Value) + 1);
+   SG_DBGOUT_PNT ("parent:", SG_UndoRedo.DPdata[internal_EntryCount].parent);
+   return 0;
+  }
+--- a/src/gnauralnet.h
++++ b/src/gnauralnet.h
+@@ -230,7 +230,7 @@ void GN_Time_ProcessOutgoingData (GN_Fri
+ void GN_ShowInfo ();
+ 
+ //Global variables:
+-unsigned short GN_ScheduleFingerprint;
++extern unsigned short GN_ScheduleFingerprint;
+ typedef struct GN_Globals_type
+ {
+  int State;                     //DO NOT MOVE THIS; it gets initialized in gnauralnet_main
+--- a/src/gnauralnet_main.c
++++ b/src/gnauralnet_main.c
+@@ -103,7 +103,7 @@ int GN_start (int (*main_loop_func) (voi
+   GN_ProcessIncomingData = incoming_data_func;
+  }
+ 
+- GN_DBGOUT_INT ("Size of GN_CommBuffer:", sizeof (GN_CommBuffer));
++ GN_DBGOUT_INT ("Size of GN_CommBuffer:", (int)sizeof (GN_CommBuffer));
+  //init network:
+  if (GN_init () != 0)
+  {
+--- a/src/main.c
++++ b/src/main.c
+@@ -4447,7 +4447,7 @@ int main_LoadSoundFile_shorts
+  SG_DBGOUT_INT ("readcount: ", readcount);
+  SG_DBGOUT_INT ("framecount: ", (int) sfinfo.frames);
+  SG_DBGOUT_INT ("array sizeof (bytes):",
+-                ((int) sfinfo.frames) * sizeof (short) * 2);
++                ((int) sfinfo.frames) * (int)sizeof (short) * 2);
+  SG_DBGOUT_INT ("array elements: (shorts)", (*size));
+  return 0;      //success
+  //  Gnaural.wav
+@@ -4515,7 +4515,7 @@ int main_LoadSoundFile (char *filename,
+  SG_DBGOUT_INT ("readcount: ", readcount);
+  SG_DBGOUT_INT ("framecount: ", (int) sfinfo.frames);
+  SG_DBGOUT_INT ("array sizeof (bytes):",
+-                ((int) sfinfo.frames) * sizeof (int));
++                ((int) sfinfo.frames) * (int)sizeof (int));
+  SG_DBGOUT_INT ("array elements: (shorts)", (*size));
+  return 0;      //success
+ }
+--- a/src/net/MakeLand.h
++++ b/src/net/MakeLand.h
+@@ -31,13 +31,13 @@
+  //regardless of mask. 021102
+ 
+ #define ML_SHIFT 10
+-int *MakeLand_bmpHeights;
+-int *MakeLand_bmpColors;
+-int MakeLand_Width;
+-int MakeLand_Height;
+-int MakeLand_InternallyGeneratedBitapsFlag;
++extern int *MakeLand_bmpHeights;
++extern int *MakeLand_bmpColors;
++extern int MakeLand_Width;
++extern int MakeLand_Height;
++extern int MakeLand_InternallyGeneratedBitapsFlag;
+ typedef int (*MAKELAND_USER_CALLBACK) (int message);    //declaration usage: USER_CALLBACK pUserCallback;
+-MAKELAND_USER_CALLBACK MakeLand_UserCallback;
++extern MAKELAND_USER_CALLBACK MakeLand_UserCallback;
+ 
+  /////////////////////////////
+  //creates the color and heights bitmap: