diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-07-01 12:34:21 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-07-01 12:34:21 +0000 |
commit | cdacacfb62ebdb9949a6b46a8cc63b43f916b561 (patch) | |
tree | e7519daef7d196ecbc1b69e488f5e556217633c1 /audio/glame/files | |
parent | d21bb3cf34e6c3c8889319ec6f44eea00cde8f38 (diff) | |
download | ports-cdacacfb62ebdb9949a6b46a8cc63b43f916b561.tar.gz ports-cdacacfb62ebdb9949a6b46a8cc63b43f916b561.zip |
Notes
Diffstat (limited to 'audio/glame/files')
-rw-r--r-- | audio/glame/files/patch-Makefile.in | 14 | ||||
-rw-r--r-- | audio/glame/files/patch-configure | 20 | ||||
-rw-r--r-- | audio/glame/files/patch-src::gui::util::glame_param.c | 14 | ||||
-rw-r--r-- | audio/glame/files/patch-src::plugins::audio_io_oss.c | 17 |
4 files changed, 34 insertions, 31 deletions
diff --git a/audio/glame/files/patch-Makefile.in b/audio/glame/files/patch-Makefile.in index 711599699e2d..2e29e538ca41 100644 --- a/audio/glame/files/patch-Makefile.in +++ b/audio/glame/files/patch-Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- Makefile.in 2002/05/30 11:27:13 1.1 -+++ Makefile.in 2002/05/30 11:27:31 -@@ -133,7 +133,7 @@ +--- Makefile.in.orig Tue Jul 1 15:01:06 2003 ++++ Makefile.in Tue Jul 1 15:01:55 2003 +@@ -147,7 +147,7 @@ + install_sh = @install_sh@ pkgpixmapsdir = @pkgpixmapsdir@ pkgscriptsdir = @pkgscriptsdir@ +-SUBDIRS = intl libltdl macros src doc data po ++SUBDIRS = intl macros src doc data po --SUBDIRS = libltdl macros src doc data intl po -+SUBDIRS = macros src doc data intl po + ACLOCAL_AMFLAGS = -I macros -I . - EXTRA_DIST = TODO MAINTAINERS CREDITS BUGS autogen.sh glame.spec - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/glame/files/patch-configure b/audio/glame/files/patch-configure index c6ec3e16a1b4..0893c2eae99f 100644 --- a/audio/glame/files/patch-configure +++ b/audio/glame/files/patch-configure @@ -1,18 +1,18 @@ $FreeBSD$ ---- configure 2002/05/30 11:20:36 1.1 -+++ configure 2002/05/30 11:20:46 -@@ -455,7 +455,7 @@ +--- configure.orig Tue Jul 1 15:02:34 2003 ++++ configure Tue Jul 1 15:03:00 2003 +@@ -467,7 +467,7 @@ # include <unistd.h> #endif" -ac_subdirs_all="$ac_subdirs_all libltdl" +ac_subdirs_all="$ac_subdirs_all" + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BUILD_GUILE GUILE_INCS GUILE_LIBS GUILE_TRUE GUILE_FALSE GNOME_LIBS GNOMEUI_LIBS ZVT_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG ESD_CONFIG ESD_CFLAGS ESD_LIBS IMLIB_CONFIG GNOME_APPLETS_LIBS GNOME_CAPPLET_LIBS HAVE_GNOME_TRUE HAVE_GNOME_FALSE ac_libglade_config XML_CFLAGS XML_LIBS XML2_CONFIG XML_CONFIG HAVE_FFTW_TRUE HAVE_FFTW_FALSE afconfig HAVE_OSS_TRUE HAVE_OSS_FALSE HAVE_ESD_TRUE HAVE_ESD_FALSE SGIAUDIO_LIBS HAVE_SGI_TRUE HAVE_SGI_FALSE ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE LADSPA_CFLAGS LADSPA_TRUE LADSPA_FALSE LIBOBJS EXPERIMENTAL_TRUE EXPERIMENTAL_FALSE PKG_CONFIG MAD_CFLAGS MAD_LIBS STATICLIBS_TRUE STATICLIBS_FALSE pkgpixmapsdir pkgscriptsdir GLAME_LIBS GLAME_CFLAGS GLAME_DLIBS GLAME_DCFLAGS GLAME_AUDIO_LIBS GLAME_AUDIO_CFLAGS GLAME_FFT_LIBS LIBLTDL LTDLINCL subdirs LTLIBOBJS' + ac_subst_files='' - # Initialize some variables set by options. - ac_init_help= -@@ -7280,6 +7280,7 @@ +@@ -8138,6 +8138,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -20,7 +20,7 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -18106,7 +18107,7 @@ +@@ -21263,7 +21264,7 @@ @@ -28,8 +28,8 @@ $FreeBSD$ +subdirs="$subdirs" - ac_config_files="$ac_config_files Makefile macros/Makefile doc/Makefile doc/pix/Makefile data/Makefile data/pixmaps/Makefile src/Makefile src/filter/Makefile src/swapfile/Makefile src/hash/Makefile src/plugins/Makefile src/include/Makefile src/gui/Makefile src/gui/edit_filter/Makefile src/glmid/Makefile src/gui/libgtkwaveform/Makefile src/gui/timeline/Makefile src/gui/util/Makefile intl/Makefile po/Makefile.in" -@@ -18813,8 +18814,8 @@ + ac_config_files="$ac_config_files Makefile macros/Makefile doc/Makefile doc/pix/Makefile data/Makefile data/pixmaps/Makefile src/Makefile src/filter/Makefile src/swapfile/Makefile src/hash/Makefile src/plugins/Makefile src/include/Makefile src/gui/Makefile src/glmid/Makefile intl/Makefile po/Makefile.in" +@@ -22129,8 +22130,8 @@ s,@GLAME_AUDIO_LIBS@,$GLAME_AUDIO_LIBS,;t t s,@GLAME_AUDIO_CFLAGS@,$GLAME_AUDIO_CFLAGS,;t t s,@GLAME_FFT_LIBS@,$GLAME_FFT_LIBS,;t t @@ -38,5 +38,5 @@ $FreeBSD$ +s,@LIBLTDL@,,;t t +s,@LTDLINCL@,,;t t s,@subdirs@,$subdirs,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF - diff --git a/audio/glame/files/patch-src::gui::util::glame_param.c b/audio/glame/files/patch-src::gui::util::glame_param.c deleted file mode 100644 index feb0d5a1e0b9..000000000000 --- a/audio/glame/files/patch-src::gui::util::glame_param.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/gui/util/glame_param.c 2002/07/15 15:51:58 1.1 -+++ src/gui/util/glame_param.c 2002/07/15 15:52:30 -@@ -321,7 +321,7 @@ - gparam->label = gtk_label_new(label); - gparam->u.adj = GTK_ADJUSTMENT(gtk_adjustment_new( - filterparam_val_int(param), -- -MAXINT, MAXINT, 1.0, 10.0, 0.0)); -+ -INT_MAX, INT_MAX, 1.0, 10.0, 0.0)); - gparam->widget = gtk_spin_button_new(gparam->u.adj, 1, 0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gparam->widget), - TRUE); diff --git a/audio/glame/files/patch-src::plugins::audio_io_oss.c b/audio/glame/files/patch-src::plugins::audio_io_oss.c new file mode 100644 index 000000000000..f59657bd3244 --- /dev/null +++ b/audio/glame/files/patch-src::plugins::audio_io_oss.c @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1 ++++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41 +@@ -26,9 +26,9 @@ + + #ifdef HAVE_OSS_LINUX + #include <linux/soundcard.h> +-#elif HAVE_OSS_SYS ++#elif defined(HAVE_OSS_SYS) + #include <sys/soundcard.h> +-#elif HAVE_OSS_MACHINE ++#elif defined(HAVE_OSS_MACHINE) + #include <machine/soundcard.h> + #else + #error BUG in OSS configuration. |