Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revert "Merge branch 'master' of ssh://us.holligan.net/home/a…
…ndrew/openbsd-wip/"" This reverts commit 43e9b0b. Conflicts: multimedia/get_flash_videos/Makefile multimedia/get_flash_videos/pkg/PLIST multimedia/phonon/Makefile net/wireshark16/Makefile x11/grantlee/Makefile
- Loading branch information
Showing
768 changed files
with
339,376 additions
and
13,631 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fix regressions. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # $OpenBSD: Makefile.template,v 1.61 2012/03/29 13:41:58 sthen Exp $ | ||
|
|
||
| COMMENT = minimal MIDI sequencer | ||
|
|
||
| #http://www.filter24.org/seq24/seq24-0.8.7.tar.gz | ||
| DISTNAME = seq24-0.8.7 | ||
|
|
||
| CATEGORIES = audio | ||
|
|
||
| HOMEPAGE = http://www.filter24.org/seq24/ | ||
|
|
||
| MAINTAINER = Edd Barrett <edd@openbsd.org> | ||
|
|
||
| # XXX | ||
| PERMIT_PACKAGE_CDROM = Yes | ||
| PERMIT_PACKAGE_FTP = Yes | ||
| PERMIT_DISTFILES_CDROM =Yes | ||
| PERMIT_DISTFILES_FTP = Yes | ||
|
|
||
| WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama | ||
| WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 c cairo cairomm-1.0 | ||
| WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 | ||
| WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 | ||
| WANTLIB += gtk-x11-2.0 gtkmm-2.4 iconv intl m pango-1.0 pangocairo-1.0 | ||
| WANTLIB += pangoft2-1.0 pangomm-1.4 pixman-1 png pthread pthread-stubs | ||
| WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm z | ||
|
|
||
| MASTER_SITES = ${HOMEPAGE} | ||
|
|
||
| LIB_DEPENDS = x11/gtk2mm | ||
|
|
||
| CONFIGURE_STYLE = autoconf | ||
| AUTOCONF_VERSION = 2.68 | ||
| AUTOMAKE_VERSION = 1.11 | ||
|
|
||
| CONFIGURE_ARGS = --disable-jack-support | ||
| MAKE_FLAGS = ALSA_LIBS= ALSA_CFLAGS= | ||
|
|
||
| NO_REGRESS = Yes | ||
|
|
||
| .include <bsd.port.mk> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| SHA256 (seq24-0.8.7.tar.gz) = +6nFR5mcL6aMmTvy42cIc0PsKUjNEXLUR+AI4fpSs+4= | ||
| SIZE (seq24-0.8.7.tar.gz) = 194461 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| $OpenBSD$ | ||
| --- configure.in.orig Wed May 31 02:17:06 2006 | ||
| +++ configure.in Fri Sep 21 14:42:43 2012 | ||
| @@ -15,8 +15,9 @@ AC_PROG_INSTALL | ||
| AC_PROG_LN_S | ||
|
|
||
| dnl Checks for libraries. | ||
| -AC_CHECK_LIB(rt,main, , | ||
| - AC_MSG_ERROR([POSIX.1b RealTime Library Missing -lrt])) | ||
| +dnl Not needed on OpenBSD | ||
| +#AC_CHECK_LIB(rt,main, , | ||
| +# AC_MSG_ERROR([POSIX.1b RealTime Library Missing -lrt])) | ||
|
|
||
| dnl Checks for header files. | ||
| AC_HEADER_STDC | ||
| @@ -28,7 +29,9 @@ AC_C_CONST | ||
| dnl Checks for library functions. | ||
| AC_CHECK_FUNCS(select) | ||
|
|
||
| -AM_PATH_ALSA(0.9.0) | ||
| +dnl not on OpenBSD | ||
| +#AM_PATH_ALSA(0.9.0) | ||
| +ALSA_LIBS="" | ||
|
|
||
| ####AM_PATH_GTKMM(1.2.0) OLD | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| $OpenBSD$ | ||
| --- src/dump.cpp.orig Fri Sep 21 14:56:31 2012 | ||
| +++ src/dump.cpp Fri Sep 21 14:58:08 2012 | ||
| @@ -3,9 +3,10 @@ | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <unistd.h> | ||
| + | ||
| +#if defined(__LINUX__) | ||
| #include <alsa/asoundlib.h> | ||
|
|
||
| - | ||
| snd_seq_t *open_seq(); | ||
| void midi_action(snd_seq_t *seq_handle); | ||
|
|
||
| @@ -101,3 +102,9 @@ int main(int argc, char *argv[]) { | ||
| } | ||
| } | ||
| } | ||
| +#else | ||
| +int main(int argc, char *argv[]) { | ||
| + printf("Not supported on this platform\n"); | ||
| + return (EXIT_SUCCESS); | ||
| +} | ||
| +#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| $OpenBSD$ | ||
| --- src/mainwnd.h.orig Fri Sep 21 13:40:35 2012 | ||
| +++ src/mainwnd.h Fri Sep 21 13:40:03 2012 | ||
| @@ -109,7 +109,11 @@ class mainwnd : public Gtk::Window | ||
|
|
||
| Entry *m_entry_notes; | ||
|
|
||
| +#if defined(__OpenBSD__) | ||
| + sigc::connection m_timeout_connect; | ||
| +#else | ||
| SigC::Connection m_timeout_connect; | ||
| +#endif | ||
|
|
||
| void file_new_dialog( void ); | ||
| void file_save_dialog( void ); |
Oops, something went wrong.
270b4b7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was a VERY large hammer to get back changes from a few weeks. Everyone who was working on something before recent Andrew's merges, PLEASE, review THIS commit. Thanks and sorry for any possible inconvenience here.