cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove synaesthesia, suggested by landry, ok ajacoutot

Browse Source
This commit is contained in:
ratchov 2014-11-01 08:13:31 +00:00
parent cdabae0a2a
commit d816f61cb0
13 changed files with 5 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.188 2014/10/31 12:10:59 jasper Exp $
# $OpenBSD: Makefile,v 1.189 2014/11/01 08:13:31 ratchov Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.34
PKGNAME = quirks-2.35
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.193 2014/10/31 12:10:59 jasper Exp $
# $OpenBSD: Quirks.pm,v 1.194 2014/11/01 08:13:31 ratchov Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -461,6 +461,7 @@ my $obsolete_reason = {
'ruby-minion' => 3,
'ruby-bunny' => 3,
'ruby-randexp' => 3,
'synaesthesia' => 0,
};
# ->is_base_system($handle, $state):

3
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.376 2014/10/31 23:07:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.377 2014/11/01 08:13:31 ratchov Exp $
SUBDIR =
SUBDIR += DevIL
@ -251,7 +251,6 @@
SUBDIR += smpeg-xmms
SUBDIR += swfdec
SUBDIR += sxiv
SUBDIR += synaesthesia
SUBDIR += tesseract
SUBDIR += tesseract-langs
SUBDIR += tgif

42
graphics/synaesthesia/Makefile
View File

@ -1,42 +0,0 @@
# $OpenBSD: Makefile,v 1.18 2013/03/11 11:10:55 espie Exp $
COMMENT= visual sound representation
DISTNAME= synaesthesia-2.1
REVISION = 1
CATEGORIES= graphics x11
HOMEPAGE= http://yoyo.cc.monash.edu.au/~pfh/synaesthesia.html
# GPL
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= ICE SM X11 c m ossaudio pthread stdc++ SDL
MASTER_SITES= http://yoyo.cc.monash.edu.au/~pfh/
# esound default so it works with mpg123-esd and not just CDs
FLAVORS= esd
FLAVOR?= esd
LIB_DEPENDS= devel/sdl
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
.if ${FLAVOR:Mesd}
LIB_DEPENDS+= audio/esound
CONFIGURE_ARGS+= --with-esound
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
WANTLIB += esd>=2
.else
CONFIGURE_ARGS+= --disable-esound
.endif
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/synaesthesia ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/synaesthesia
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/synaesthesia
.include <bsd.port.mk>

5
graphics/synaesthesia/distinfo
View File

@ -1,5 +0,0 @@
MD5 (synaesthesia-2.1.tar.gz) = W8Fm3rNpo8ce/WHhrV5UdQ==
RMD160 (synaesthesia-2.1.tar.gz) = b4/Y7TuRqWe1tmhf54ySrM0DydQ=
SHA1 (synaesthesia-2.1.tar.gz) = UXMy9tvvC0xO4ezQuRKRwDFqDgE=
SHA256 (synaesthesia-2.1.tar.gz) = IEua8jU/5uU6c89Qh1oSzw9Tjqqod5rL6ENAyLzc0uY=
SIZE (synaesthesia-2.1.tar.gz) = 129209

12
graphics/synaesthesia/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2002/09/08 07:43:52 mark Exp $
--- Makefile.in.orig Wed Jun 7 22:41:05 2000
+++ Makefile.in Sun Sep 8 00:38:45 2002
@@ -79,7 +79,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lossaudio
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@

28
graphics/synaesthesia/patches/patch-polygon_h
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-polygon_h,v 1.1 2010/05/22 13:43:24 espie Exp $
--- polygon.h.orig Sat May 22 15:27:46 2010
+++ polygon.h Sat May 22 15:40:14 2010
@@ -28,8 +28,8 @@ struct PolygonEngine : public Bitmap<Pixel> {
#define super (1<<superSampleShift)
void apply(Pixel *dest) {
Pixel sum=0;
- int count = width*height;
- Pixel *src = data;
+ int count = this->width*this->height;
+ Pixel *src = this->data;
while(count--) {
sum += *(src++);
if (sum)
@@ -40,10 +40,10 @@ struct PolygonEngine : public Bitmap<Pixel> {
void add(Pixel color,int x,int y) {
if (y < 0) return;
- if (y >= height) return;
+ if (y >= this->height) return;
if (x < 0) x = 0;
- if (x > width) x = width;
- data[x+y*width] += color;
+ if (x > this->width) x = this->width;
+ this->data[x+y*this->width] += color;
}
/* Color is char[layers] */

208
graphics/synaesthesia/patches/patch-sound_cc
View File

@ -1,208 +0,0 @@
$OpenBSD: patch-sound_cc,v 1.3 2010/05/22 13:43:24 espie Exp $
--- sound.cc.orig Thu Jun 8 07:41:06 2000
+++ sound.cc Sat May 22 15:26:39 2010
@@ -34,16 +34,22 @@
#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
-#ifndef __FreeBSD__
-#include <linux/soundcard.h>
-#include <linux/cdrom.h>
-//#include <linux/ucdrom.h>
-#else
+#ifdef __OpenBSD__
+#include <soundcard.h>
+#include <sys/cdio.h>
+#define CDROM_LEADOUT 0xAA
+#define CD_FRAMES 75 /* frames per second */
+#define CDROM_DATA_TRACK 0x4
+#elif __FreeBSD__
#include <machine/soundcard.h>
#include <sys/cdio.h>
#define CDROM_LEADOUT 0xAA
#define CD_FRAMES 75 /* frames per second */
#define CDROM_DATA_TRACK 0x4
+#else
+#include <linux/soundcard.h>
+#include <linux/cdrom.h>
+//#include <linux/ucdrom.h>
#endif
#include <time.h>
@@ -87,7 +93,7 @@ void getTrackInfo(void) {
trackFrame = 0;
trackCount = 0;
-#ifndef __FreeBSD__
+#if defined(__linux__)
cdrom_tochdr cdTochdr;
if (-1 == ioctl(cdDevice, CDROMREADTOCHDR, &cdTochdr))
#else
@@ -95,7 +101,7 @@ void getTrackInfo(void) {
if (-1 == ioctl(cdDevice, CDIOREADTOCHEADER, (char *)&cdTochdr))
#endif
return;
-#ifndef __FreeBSD__
+#if defined(__linux__)
trackCount = cdTochdr.cdth_trk1;
#else
trackCount = cdTochdr.ending_track - cdTochdr.starting_track + 1;
@@ -104,7 +110,7 @@ void getTrackInfo(void) {
int i;
trackFrame = new int[trackCount+1];
for(i=trackCount;i>=0;i--) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
cdrom_tocentry cdTocentry;
cdTocentry.cdte_format = CDROM_MSF;
cdTocentry.cdte_track = (i == trackCount ? CDROM_LEADOUT : i+1);
@@ -120,7 +126,7 @@ void getTrackInfo(void) {
//Bug fix: thanks to Ben Gertzfield (9/7/98)
//Leadout track is sometimes reported as data.
//Added check for this.
-#ifndef __FreeBSD__
+#if defined(__linux__)
if (-1 == ioctl(cdDevice, CDROMREADTOCENTRY, & cdTocentry) ||
(i != trackCount && (cdTocentry.cdte_ctrl & CDROM_DATA_TRACK)))
trackFrame[i] = (i==trackCount?0:trackFrame[i+1]);
@@ -153,7 +159,7 @@ int cdGetTrackFrame(int track) {
}
void cdPlay(int frame, int endFrame) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
cdrom_msf msf;
#else
struct ioc_play_msf msf;
@@ -168,7 +174,7 @@ void cdPlay(int frame, int endFrame) {
// (Sybren Stuvel)
cdStop();
-#ifndef __FreeBSD__
+#if defined(__linux__)
msf.cdmsf_min0 = frame / (60*CD_FRAMES);
msf.cdmsf_sec0 = frame / CD_FRAMES % 60;
msf.cdmsf_frame0 = frame % CD_FRAMES;
@@ -181,7 +187,7 @@ void cdPlay(int frame, int endFrame) {
//Bug fix: thanks to Martin Mitchell
//An out by one error that affects some CD players.
//Have to use endFrame-1 rather than endFrame (9/7/98)
-#ifndef __FreeBSD__
+#if defined(__linux__)
msf.cdmsf_min1 = (endFrame-1) / (60*CD_FRAMES);
msf.cdmsf_sec1 = (endFrame-1) / CD_FRAMES % 60;
msf.cdmsf_frame1 = (endFrame-1) % CD_FRAMES;
@@ -195,7 +201,7 @@ void cdPlay(int frame, int endFrame) {
}
void cdGetStatus(int &track, int &frames, SymbolID &state) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
cdrom_subchnl subchnl;
subchnl.cdsc_format = CDROM_MSF;
if (-1 == ioctl(cdDevice, CDROMSUBCHNL, &subchnl)) {
@@ -215,7 +221,7 @@ void cdGetStatus(int &track, int &frames, SymbolID &st
state = (state == Open ? Open : NoCD); /* ? */
return;
}
-#ifndef __FreeBSD__
+#if defined(__linux__)
track = subchnl.cdsc_trk;
frames = subchnl.cdsc_reladdr.msf.minute*60*CD_FRAMES+
subchnl.cdsc_reladdr.msf.second*CD_FRAMES+
@@ -228,7 +234,7 @@ void cdGetStatus(int &track, int &frames, SymbolID &st
#endif
SymbolID oldState = state;
-#ifndef __FreeBSD__
+#if defined(__linux__)
switch(subchnl.cdsc_audiostatus) {
case CDROM_AUDIO_PAUSED : state = Pause; break;
case CDROM_AUDIO_PLAY : state = Play; break;
@@ -259,38 +265,38 @@ void cdGetStatus(int &track, int &frames, SymbolID &st
void cdStop(void) {
//attemptNoDie(ioctl(cdDevice, CDROMSTOP),"stopping CD");
-#ifndef __FreeBSD__
+#if defined(__linux__)
ioctl(cdDevice, CDROMSTOP);
-#else
- ioctl(cdDevice, CDIOCSTOP);
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ ioctl(cdDevice, CDIOCSTOP, NULL);
#endif
}
void cdPause(void) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
attemptNoDie(ioctl(cdDevice, CDROMPAUSE),"pausing CD",true);
-#else
- attemptNoDie(ioctl(cdDevice, CDIOCPAUSE),"pausing CD",true);
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ attemptNoDie(ioctl(cdDevice, CDIOCPAUSE, NULL),"pausing CD",true);
#endif
}
void cdResume(void) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
attemptNoDie(ioctl(cdDevice, CDROMRESUME),"resuming CD",true);
-#else
- attemptNoDie(ioctl(cdDevice, CDIOCRESUME),"resuming CD",true);
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ attemptNoDie(ioctl(cdDevice, CDIOCRESUME, NULL),"resuming CD",true);
#endif
}
void cdEject(void) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
attemptNoDie(ioctl(cdDevice, CDROMEJECT),"ejecting CD",true);
-#else
- attemptNoDie(ioctl(cdDevice, CDIOCEJECT),"ejecting CD",true);
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ attemptNoDie(ioctl(cdDevice, CDIOCEJECT, NULL),"ejecting CD",true);
#endif
}
void cdCloseTray(void) {
-#ifndef __FreeBSD__
+#if defined(__linux__)
attemptNoDie(ioctl(cdDevice, CDROMCLOSETRAY),"ejecting CD",true);
-#else
- attemptNoDie(ioctl(cdDevice, CDIOCCLOSE),"ejecting CD",true);
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+ attemptNoDie(ioctl(cdDevice, CDIOCCLOSE, NULL),"ejecting CD",true);
#endif
}
@@ -379,7 +385,7 @@ void openSound(SoundSource source, int inFrequency, ch
int format, stereo, fragment, fqc;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
attempt(device = open(dspName,O_WRONLY),"opening dsp device",true);
format = SOUNDFORMAT;
attempt(ioctl(device,SNDCTL_DSP_SETFMT,&format),"setting format",true);
@@ -408,7 +414,7 @@ void openSound(SoundSource source, int inFrequency, ch
//Was 0x00010000 + m;
attemptNoDie(ioctl(device,SNDCTL_DSP_SETFRAGMENT,&fragment),"setting fragment",true);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) || !defined(__OpenBSD__)
attempt(ioctl(device,SNDCTL_DSP_SETFMT,&format),"setting format",true);
if (format != SOUNDFORMAT) error("setting format (2)");
#endif
@@ -422,8 +428,12 @@ void openSound(SoundSource source, int inFrequency, ch
close(0);
}
}
-
- data = new short[NumSamples*2];
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ data = new u_short[NumSamples*2];
+#else
+ data = new short[NumSamples*2];
+#endif
+
memset((char*)data,0,NumSamples*4);
}

28
graphics/synaesthesia/patches/patch-syna_h
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-syna_h,v 1.3 2010/05/22 13:43:24 espie Exp $
--- syna.h.orig Thu Jun 8 07:41:06 2000
+++ syna.h Sat May 22 15:26:39 2010
@@ -48,22 +48,13 @@
#define NumSamples (1<<LogSize)
#define RecSize (1<<LogSize-Overlap)
-#ifdef __FreeBSD__
-
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
typedef unsigned short sampleType;
-
#else
-
typedef short sampleType;
-
-#ifndef __linux__
-
-#warning This target has not been tested!
-
#endif
-#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <machine/endian.h>
#else
#include <endian.h>

14
graphics/synaesthesia/patches/patch-ui_cc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ui_cc,v 1.2 2002/09/08 07:43:52 mark Exp $
--- ui.cc.orig Wed Jun 7 22:41:06 2000
+++ ui.cc Sun Sep 8 00:38:45 2002
@@ -1,8 +1,8 @@
+#include <math.h>
+#include <stdlib.h>
#include "font.h"
#include "icons.h"
#include "syna.h"
-#include <math.h>
-#include <stdlib.h>
void putChar(unsigned char character,int x,int y,int red,int blue) {
unsigned short *ptr = ((unsigned short *)output) + x + y*outWidth;

12
graphics/synaesthesia/patches/patch-xlib_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xlib_c,v 1.2 2002/09/08 07:43:52 mark Exp $
--- xlib.c.orig Wed Jun 7 22:41:06 2000
+++ xlib.c Sun Sep 8 00:38:45 2002
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifndef __FreeBSD__
+#if defined(__linux__)
#include <malloc.h>
#else
#include <stdlib.h>

11
graphics/synaesthesia/pkg/DESCR
View File

@ -1,11 +0,0 @@
This is a program for representing sounds visually. It goes beyond
the usual oscilliscope style program by combining an FFT and stereo
positioning information to give a two dimensional display. Some of the
shapes I have observed are:
* Drums: clouds of color, fairly high
* Clean guitar: several horizontal lines, low down
* Rough guitar: a cloud, low down
* Trumpet: Lots of horizontal lines everywhere
* Flute: A single horizontal line, low down
* Voice: A vertical line with some internal structure
* Synthesizer: All kinds of weird shapes!

4
graphics/synaesthesia/pkg/PLIST
View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:50:11 espie Exp $
bin/synaesthesia
share/doc/synaesthesia/
share/doc/synaesthesia/README