From fd2874cfb4dd357be0f30b42e917cda3df209329 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 5 Oct 2006 04:56:27 +0000 Subject: Fixed missing include in flowcanvas (uint32_t). Added new temporary (yet spiffy if I do say so myself) icon. Added desktop entry so Ingenuity shows up in desktop menus all spiff like. git-svn-id: http://svn.drobilla.net/lad/ingen@159 a436a847-0d15-0410-975c-d299462d15a1 --- configure.ac | 3 +-- ingen.spec | 51 ----------------------------------- src/progs/ingenuity/Makefile.am | 8 +++++- src/progs/ingenuity/ingen-icon.svg | 54 +++++++++++++++++++++++++++++++++++++ src/progs/ingenuity/om-icon.png | Bin 1189 -> 0 bytes 5 files changed, 62 insertions(+), 54 deletions(-) delete mode 100644 ingen.spec create mode 100644 src/progs/ingenuity/ingen-icon.svg delete mode 100644 src/progs/ingenuity/om-icon.png diff --git a/configure.ac b/configure.ac index 1f9ce7eb..e8ce24b5 100644 --- a/configure.ac +++ b/configure.ac @@ -352,7 +352,6 @@ AM_CONDITIONAL(MONOLITHIC_INGENUITY, [test "$monolithic_ingenuity" = "yes"]) # Build client lib if anything above that depends on it is to be built AM_CONDITIONAL(BUILD_CLIENT_LIB, [test "$build_console_clients" = "yes" -o "$build_gtk_client" = "yes"]) - # Write Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) @@ -371,9 +370,9 @@ AC_CONFIG_FILES([src/progs/python/scripts/Makefile]) AC_CONFIG_FILES([src/progs/demolition/Makefile]) AC_CONFIG_FILES([src/progs/patch_loader/Makefile]) AC_CONFIG_FILES([src/progs/ingenuity/Makefile]) +AC_CONFIG_FILES([src/progs/ingenuity/ingenuity.desktop]) AC_CONFIG_FILES([patches/Makefile]) AC_CONFIG_FILES([doc/Doxyfile]) - AC_OUTPUT AC_MSG_RESULT([]) diff --git a/ingen.spec b/ingen.spec deleted file mode 100644 index acc550fb..00000000 --- a/ingen.spec +++ /dev/null @@ -1,51 +0,0 @@ -Summary: A realtime modular synthesizer for GNU/Linux audio systems with support Jack and LADSPA or DSSI plugins. -Name: ingen -Version: 0.3.0pre -Release: 1 -License: GPL -Group: Applications/Multimedia -URL: http://www.nongnu.org/om-synth/ -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Requires: liblo jackit libxml2 libalsa2 ladspa libdssi0 libgtkmm2.4_1 libglademm2.4_1 libgnomecanvasmm2.6_1 -BuildRequires: liblo-devel libjack0-devel libxml2-devel libalsa2-devel ladspa-devel libdssi0-devel libgtkmm2.4_1-devel libglademm2.4_1-devel libgnomecanvasmm2.6_1-devel - -%description -Ingen is a modular synthesizer for GNU/Linux audio systems with: -Completely OSC controlled engine, (meaning you can control Ingen over a network, from any number of clients), -LADSPA and DSSI plugin support, A minimal number of special internal "plugins" (MIDI in, audio outputs, transport, etc.), Polyphony, Multiple top-level patches, with subpatching (unlimited depth). -%prep -%setup -q - -%build -%configure -make - -%install -%{__rm} -rf %{buildroot} -%{__make} install \ - DESTDIR="%{buildroot}" - - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{_bindir}/om -%{_bindir}/ingenuity -%{_bindir}/om_patch_loader -%dir %{_datadir}/om -%{_datadir}/om/patches/*.om -%dir %{_datadir}/om-gtk -%{_datadir}/om-gtk/ingenuity.glade -%{_datadir}/om-gtk/om-icon.png - - -%doc AUTHORS ChangeLog COPYING NEWS README THANKS - - -%changelog -* Tue Apr 26 2005 Loki Davison -- initial package, v0.0.1 - diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am index 85a23011..a54f00c8 100644 --- a/src/progs/ingenuity/Makefile.am +++ b/src/progs/ingenuity/Makefile.am @@ -4,7 +4,13 @@ EXTRA_DIST = ingenuity.gladep MAINTAINERCLEANFILES = Makefile.in sharefilesdir = $(pkgdatadir) -dist_sharefiles_DATA = ingenuity.glade om-icon.png +dist_sharefiles_DATA = ingenuity.glade ingen-icon.svg + +desktopfilesdir = $(datadir)/applications +dist_desktopfiles_DATA = ingenuity.desktop + +globalpixmapsdir = $(datadir)/pixmaps +dist_globalpixmaps_DATA = ingen-icon.svg ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@ ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ ../../libs/client/libingenclient.la diff --git a/src/progs/ingenuity/ingen-icon.svg b/src/progs/ingenuity/ingen-icon.svg new file mode 100644 index 00000000..a15ed7e7 --- /dev/null +++ b/src/progs/ingenuity/ingen-icon.svg @@ -0,0 +1,54 @@ + + + + + + + image/svg+xml + + + + + + + + diff --git a/src/progs/ingenuity/om-icon.png b/src/progs/ingenuity/om-icon.png deleted file mode 100644 index b26dd942..00000000 Binary files a/src/progs/ingenuity/om-icon.png and /dev/null differ -- cgit v1.2.1