ports/85838: New port: multimedia/jahshaka Video and film composing, editing and special fx system

Igor Pokrovsky ip at doom.homeunix.org
Wed Sep 7 16:30:17 UTC 2005 

>Number:         85838
>Category:       ports
>Synopsis:       New port: multimedia/jahshaka Video and film composing, editing and special fx system
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 07 16:30:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Wed Sep 7 09:26:18 MSD 2005 root at doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-p3 i386


	
>Description:
Jahshaka is a video and film compositing, editing and special fx system
that uses OpenGL & OpenML hardware rendering to give operators real time
interactivity. The system is cross platform, and also includes full CG,
paint and image processing modules.

WWW:	http://www.jahshaka.org/
	
>How-To-Repeat:
	
>Fix:

	

--- jahshaka.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	jahshaka
#	jahshaka/pkg-plist
#	jahshaka/pkg-descr
#	jahshaka/distinfo
#	jahshaka/Makefile
#	jahshaka/files
#	jahshaka/files/patch-jahshakaSettings.pro
#	jahshaka/files/patch-jah_libraries_jahaudio_sndfile.h
#	jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.cpp
#	jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.h
#	jahshaka/files/patch-jah_libraries_jahaudio_common.h
#	jahshaka/files/patch-jah_libraries_jahaudio_ima__adpcm.c
#	jahshaka/files/patch-jah_libraries_jahaudio_ms__adpcm.c
#	jahshaka/files/patch-jah_libraries_jahaudio_paf.c
#	jahshaka/files/patch-jah_libraries_jahaudio_alaw.c
#	jahshaka/files/patch-jah_libraries_jahaudio_config.h
#	jahshaka/files/patch-jah_Source_jahshaka.cpp
#
echo c - jahshaka
mkdir -p jahshaka > /dev/null 2>&1
echo x - jahshaka/pkg-plist
sed 's/^X//' >jahshaka/pkg-plist << 'END-of-jahshaka/pkg-plist'
Xbin/jahshaka
Xlib/jahshaka/plugins/libjitaverage.so
Xlib/jahshaka/plugins/libjitgaussnoise.so
Xlib/jahshaka/plugins/libjitgeommeanfilter.so
Xlib/jahshaka/plugins/libjitmedianfilter.so
Xlib/jahshaka/plugins/libjitminmaxfilter.so
Xlib/jahshaka/plugins/libjitmmsefilter.so
Xlib/jahshaka/plugins/libjitnegexnoise.so
Xlib/jahshaka/plugins/libjitpseudocolor.so
Xlib/jahshaka/plugins/libjitrangefilter.so
Xlib/jahshaka/plugins/libjitrgbvary.so
Xlib/jahshaka/plugins/librfxnvblur.so
Xlib/jahshaka/plugins/librfxnvcharcoal.so
Xlib/jahshaka/plugins/librfxnvcolor.so
Xlib/jahshaka/plugins/librfxnvcompoundeye.so
Xlib/jahshaka/plugins/librfxnvdiffusion.so
Xlib/jahshaka/plugins/librfxnvdistortion.so
Xlib/jahshaka/plugins/librfxnvedgedetect.so
Xlib/jahshaka/plugins/librfxnvfire.so
Xlib/jahshaka/plugins/librfxnvfisheye.so
Xlib/jahshaka/plugins/librfxnvflame.so
Xlib/jahshaka/plugins/librfxnvfog.so
Xlib/jahshaka/plugins/librfxnvlighting.so
Xlib/jahshaka/plugins/librfxnvnorthernlights.so
Xlib/jahshaka/plugins/librfxnvpan.so
Xlib/jahshaka/plugins/librfxnvreflection.so
Xlib/jahshaka/plugins/librfxnvsharpen.so
Xlib/jahshaka/plugins/librfxnvsphere.so
Xlib/jahshaka/plugins/librfxnvswirl.so
Xlib/jahshaka/plugins/librfxnvturbulence.so
Xlib/jahshaka/plugins/librtripple.so
Xlib/jahshaka/plugins/libvfxbathroom.so
Xlib/jahshaka/plugins/libvfxfisheye.so
Xlib/jahshaka/plugins/libvfxgrey.so
Xlib/jahshaka/plugins/libvfxmandelbrot.so
Xlib/jahshaka/plugins/libvfxmosaic.so
Xlib/jahshaka/plugins/libvfxoil.so
Xlib/jahshaka/plugins/libvfxpolarnoise.so
Xlib/jahshaka/plugins/libvfxpolarwarp.so
Xlib/jahshaka/plugins/libvfxrelief.so
Xlib/jahshaka/plugins/libvfxswirl.so
X%%DATADIR%%/Pixmaps/desktop/binview.png
X%%DATADIR%%/Pixmaps/desktop/jahnodes.png
X%%DATADIR%%/Pixmaps/desktop/phototool.png
X%%DATADIR%%/Pixmaps/desktop/rotatetool.png
X%%DATADIR%%/Pixmaps/desktop/scaletool.png
X%%DATADIR%%/Pixmaps/desktop/simplezoomin.png
X%%DATADIR%%/Pixmaps/desktop/simplezoomout.png
X%%DATADIR%%/Pixmaps/desktop/thumbview.png
X%%DATADIR%%/Pixmaps/desktop/transtool.png
X%%DATADIR%%/Pixmaps/desktop/zoomin.png
X%%DATADIR%%/Pixmaps/desktop/zoomout.png
X%%DATADIR%%/Pixmaps/desktopController/delete_off.png
X%%DATADIR%%/Pixmaps/desktopController/delete_on.png
X%%DATADIR%%/Pixmaps/desktopController/load_off.png
X%%DATADIR%%/Pixmaps/desktopController/load_on.png
X%%DATADIR%%/Pixmaps/desktopController/name_off.png
X%%DATADIR%%/Pixmaps/desktopController/name_on.png
X%%DATADIR%%/Pixmaps/desktopController/play_off.png
X%%DATADIR%%/Pixmaps/desktopController/play_on.png
X%%DATADIR%%/Pixmaps/interface/metal.xpm
X%%DATADIR%%/Pixmaps/interface/metaldark.xpm
X%%DATADIR%%/Pixmaps/jahaudio.png
X%%DATADIR%%/Pixmaps/jahback.png
X%%DATADIR%%/Pixmaps/jahlayer.png
X%%DATADIR%%/Pixmaps/jahlogo.png
X%%DATADIR%%/Pixmaps/jahplayer/playerdelete.png
X%%DATADIR%%/Pixmaps/jahplayer/playerdeleteon.png
X%%DATADIR%%/Pixmaps/jahplayer/playerload.png
X%%DATADIR%%/Pixmaps/jahplayer/playerloadon.png
X%%DATADIR%%/Pixmaps/jahplayer/playername.png
X%%DATADIR%%/Pixmaps/jahplayer/playernameon.png
X%%DATADIR%%/Pixmaps/jahplayer/playerplay.png
X%%DATADIR%%/Pixmaps/jahplayer/playerplayon.png
X%%DATADIR%%/Pixmaps/jahstartupimage.png
X%%DATADIR%%/Pixmaps/jahtext.png
X%%DATADIR%%/Pixmaps/light.xpm
X%%DATADIR%%/Pixmaps/missingmedia.png
X%%DATADIR%%/Pixmaps/modules/light.png
X%%DATADIR%%/Pixmaps/modules/reflect.png
X%%DATADIR%%/Pixmaps/no_tr.gif
X%%DATADIR%%/Pixmaps/paint/buttonBezier.png
X%%DATADIR%%/Pixmaps/paint/buttonCircle.png
X%%DATADIR%%/Pixmaps/paint/buttonCircleFilled.png
X%%DATADIR%%/Pixmaps/paint/buttonErase.png
X%%DATADIR%%/Pixmaps/paint/buttonHistoryNext.png
X%%DATADIR%%/Pixmaps/paint/buttonHistoryPrevious.png
X%%DATADIR%%/Pixmaps/paint/buttonLine.png
X%%DATADIR%%/Pixmaps/paint/buttonPen.png
X%%DATADIR%%/Pixmaps/paint/buttonRectangle.png
X%%DATADIR%%/Pixmaps/paint/buttonRectangleFilled.png
X%%DATADIR%%/Pixmaps/paint/buttonTriangle.png
X%%DATADIR%%/Pixmaps/paint/buttonTriangleFilled.png
X%%DATADIR%%/Pixmaps/play.png
X%%DATADIR%%/Pixmaps/player/ffoward_off.png
X%%DATADIR%%/Pixmaps/player/ffoward_on.png
X%%DATADIR%%/Pixmaps/player/foward_off.png
X%%DATADIR%%/Pixmaps/player/foward_on.png
X%%DATADIR%%/Pixmaps/player/frewind_off.png
X%%DATADIR%%/Pixmaps/player/frewind_on.png
X%%DATADIR%%/Pixmaps/player/play_off.png
X%%DATADIR%%/Pixmaps/player/play_on.png
X%%DATADIR%%/Pixmaps/player/rewind_off.png
X%%DATADIR%%/Pixmaps/player/rewind_on.png
X%%DATADIR%%/Pixmaps/player/stop_off.png
X%%DATADIR%%/Pixmaps/player/stop_on.png
X%%DATADIR%%/Pixmaps/trans.gif
X%%DATADIR%%/database/JahDesktopDB
X%%DATADIR%%/database/JahDesktopDB.bak
X%%DATADIR%%/database/JahplayerDesktopDB
X%%DATADIR%%/database/instructions.txt
X%%DATADIR%%/database/wipedbase
X%%DATADIR%%/fonts/arial.ttf
X%%DATADIR%%/fonts/comic.ttf
X%%DATADIR%%/fonts/impact.ttf
X%%DATADIR%%/fonts/times.ttf
X%%DATADIR%%/media/images/beck.bmp
X%%DATADIR%%/media/images/bird.png
X%%DATADIR%%/media/images/code.bmp
X%%DATADIR%%/media/images/coppertex.bmp
X%%DATADIR%%/media/images/earthtex.jpg
X%%DATADIR%%/media/images/espn.png
X%%DATADIR%%/media/images/espninterface.png
X%%DATADIR%%/media/images/fantasy.jpg
X%%DATADIR%%/media/images/font.png
X%%DATADIR%%/media/images/glasstex.bmp
X%%DATADIR%%/media/images/jahlogo.png
X%%DATADIR%%/media/images/jupiter.jpg
X%%DATADIR%%/media/images/sky.bmp
X%%DATADIR%%/media/images/starfield.jpg
X%%DATADIR%%/media/models/al.mtl
X%%DATADIR%%/media/models/f-16.mtl
X%%DATADIR%%/media/models/f-16.obj
X%%DATADIR%%/media/models/face.3DS
X%%DATADIR%%/media/models/face.bmp
X%%DATADIR%%/scenes/animtest.jsf
X%%DATADIR%%/scenes/espn.jsf
X%%DATADIR%%/scenes/grovejet.jsf
X%%DATADIR%%/scenes/pluginz.jsf
X at dirrm %%DATADIR%%/media/models
X at dirrm %%DATADIR%%/media/images
X at dirrm %%DATADIR%%/media
X at dirrm %%DATADIR%%/scenes
X at dirrm %%DATADIR%%/fonts
X at dirrm %%DATADIR%%/database
X at dirrm %%DATADIR%%/Pixmaps/player
X at dirrm %%DATADIR%%/Pixmaps/paint
X at dirrm %%DATADIR%%/Pixmaps/modules
X at dirrm %%DATADIR%%/Pixmaps/jahplayer
X at dirrm %%DATADIR%%/Pixmaps/interface
X at dirrm %%DATADIR%%/Pixmaps/desktopController
X at dirrm %%DATADIR%%/Pixmaps/desktop
X at dirrm %%DATADIR%%/Pixmaps
X at dirrm %%DATADIR%%
X at dirrm lib/jahshaka/plugins
X at dirrm lib/jahshaka
END-of-jahshaka/pkg-plist
echo x - jahshaka/pkg-descr
sed 's/^X//' >jahshaka/pkg-descr << 'END-of-jahshaka/pkg-descr'
XJahshaka is a video and film compositing, editing and special fx system
Xthat uses OpenGL & OpenML hardware rendering to give operators real time
Xinteractivity. The system is cross platform, and also includes full CG,
Xpaint and image processing modules.
X
XWWW:	http://www.jahshaka.org/
X
X- Igor Pokrovsky
Xip at doom.homeunix.org
END-of-jahshaka/pkg-descr
echo x - jahshaka/distinfo
sed 's/^X//' >jahshaka/distinfo << 'END-of-jahshaka/distinfo'
XMD5 (jahshaka_1.9a9.tar.gz) = 1da413be5ab509b417cc8d56c74cdbf3
XSIZE (jahshaka_1.9a9.tar.gz) = 4538582
END-of-jahshaka/distinfo
echo x - jahshaka/Makefile
sed 's/^X//' >jahshaka/Makefile << 'END-of-jahshaka/Makefile'
X# New ports collection makefile for: jahshaka
X# Date created:		07 Feb 2005
X# Whom:			Igor Pokrovsky <ip at doom.homeunix.org>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	jahshaka
XPORTVERSION=	1.9a9
XCATEGORIES=	multimedia
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=	${PORTNAME}fx
XDISTNAME=	${PORTNAME}_${PORTVERSION}
X
XMAINTAINER=	ip at doom.homeunix.org
XCOMMENT=	Video and film composing, editing and special fx system
X
XBUILD_DEPENDS=	${LOCALBASE}/bin/qmake:${PORTSDIR}/devel/qmake
XLIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
X		glut.3:${PORTSDIR}/graphics/libglut \
X		freetype.9:${PORTSDIR}/print/freetype2 \
X		jpeg.9:${PORTSDIR}/graphics/jpeg
X
XUSE_REINPLACE=	yes
XUSE_GL=		yes
XUSE_X_PREFIX=	yes
XUSE_QT_VER=	3
XMAKE_ENV=	QMAKESPEC=${QMAKESPEC} QTDIR=${X11BASE}
XWRKSRC=		${WRKDIR}/${PORTNAME}
X
XPORTDOCS=	README
X
XTCSH?=		/bin/csh
XQMAKE?=		${LOCALBASE}/bin/qmake
XQMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
X
Xpost-patch:
X	@(${FIND} ${WRKSRC} -name '*.h' | ${XARGS} ${REINPLACE_CMD} -i '' \
X		-e 's|avifile-0.7|avifile|g; s|malloc\.h|stdlib\.h|g')
X	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
X		${WRKSRC}/jahshakaSettings.pro
X	@${REINPLACE_CMD} -e "s|qmake|${QMAKE}|g" \
X		${WRKSRC}/configure ${WRKSRC}/plugins/configure
X	@${REINPLACE_CMD} -i '' -e "s|%%DATADIR%%|${DATADIR}|g" \
X		${WRKSRC}/jah/Source/jahshaka.cpp
X	@${REINPLACE_CMD} -i '' \
X	-e "s|JahBasePath+\"plugins/\"|\"${PREFIX}/lib/${PORTNAME}/plugins/\"|g" \
X		${WRKSRC}/jah/libraries/jahplugins/jahpluginlib.cpp
X
Xdo-configure:
X	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TCSH} ./configure
X	cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} ${TCSH} ./configure
X
Xpost-build:
X	cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} ${MAKE}
X
Xdo-install:
X	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
X
X# UI pics
X	@${MKDIR} ${DATADIR}
X.for ext in bmp jpg gif png xpm
X.for dir in "" desktop desktopController interface jahplayer modules paint player
X	@${MKDIR} ${DATADIR}/Pixmaps/${dir}
X	${FIND} -X ${WRKSRC}/Pixmaps/${dir} -name "*.${ext}" -depth 1 | \
X		${XARGS} -J % ${INSTALL_DATA} % ${DATADIR}/Pixmaps/${dir}
X.endfor
X.endfor
X
X# database
X	@${MKDIR} ${DATADIR}/database
X	${INSTALL_DATA} ${WRKSRC}/database/* ${DATADIR}/database
X
X# fonts
X	@${MKDIR} ${DATADIR}/fonts
X	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${DATADIR}/fonts
X
X# scenes
X	@${MKDIR} ${DATADIR}/scenes
X	${INSTALL_DATA} ${WRKSRC}/scenes/*.jsf ${DATADIR}/scenes
X
X# media for scenes
X	@${MKDIR} ${DATADIR}/media
X	@${MKDIR} ${DATADIR}/media/images
X	${INSTALL_DATA} ${WRKSRC}/media/images/* ${DATADIR}/media/images
X	@${MKDIR} ${DATADIR}/media/models
X	${INSTALL_DATA} ${WRKSRC}/media/models/* ${DATADIR}/media/models
X
X# plugins
X	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
X	@${MKDIR} ${PREFIX}/lib/${PORTNAME}/plugins
X	${FIND} -X ${WRKSRC}/plugins -name '*.so' | \
X	${XARGS} -J % ${INSTALL_PROGRAM} % ${PREFIX}/lib/${PORTNAME}/plugins
X
X.ifndef (NOPORTDOCS)
X	@${MKDIR} ${DOCSDIR}
X	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
X.endif
X
X.include <bsd.port.mk>
END-of-jahshaka/Makefile
echo c - jahshaka/files
mkdir -p jahshaka/files > /dev/null 2>&1
echo x - jahshaka/files/patch-jahshakaSettings.pro
sed 's/^X//' >jahshaka/files/patch-jahshakaSettings.pro << 'END-of-jahshaka/files/patch-jahshakaSettings.pro'
X--- jahshakaSettings.pro.orig
X+++ jahshakaSettings.pro
X@@ -197,6 +197,79 @@
X        
X }
X 
X+##############################################
X+# FreeBSD specific settings here
X+##############################################
X+
X+contains( OSNAME, FreeBSD ) {
X+    message( "Using FreeBSD presets..." )
X+    OSDEF = FOUND
X+
X+    #os specific variable
X+    JAHOS=LINUX
X+    DEFINES += JAHLINUX
X+
X+#    QTPATH = /usr/lib/qt-3.1
X+#    JAHDEPENDPATH = /usr/lib/qt-3.1/include
X+
X+    #location of freetype libraries
X+    FREEDIR = %%LOCALBASE%%/include/freetype2
X+ 
X+    #for the audio hack
X+    contains( JAHAUDIO,true ) {
X+    #we hack the directories where libaudio is on to freedir
X+#    FREEDIR += /usr/local/include
X+#    FREEDIR += /usr/include
X+        DEFINES += AUDIOSUPPORT
X+    }
X+
X+    #for avi
X+    contains( LINUXAVISUPPORT,true ) {
X+        DEFINES += LINUXAVISUPPORT
X+    }
X+
X+    #for spaceball
X+    contains( SPACEBALL,true ) {
X+        DEFINES += SPACEBALL
X+    }
X+
X+    #for native mpeg support
X+    contains( JAHMPEGDECODER,true ) {
X+        DEFINES += JAHMPEGDECODER
X+    }
X+
X+    #for native mpeg encoder support
X+    contains( JAHMPEGENCODER,true ) {
X+        DEFINES += JAHMPEGENCODER
X+    }
X+
X+    #for Clearspeed
X+    contains( CLEARSPEED,true ) {
X+        DEFINES += CLEARSPEED
X+        DEFINES += __LITTLE_ENDIAN
X+    }
X+
X+    #for Nvidia GPU
X+    contains( NVIDIA_GPU,true ) {
X+        DEFINES += NVIDIA_GPU
X+    }
X+
X+    #for Nvidia GPGPU
X+    contains( NVIDIA_GPGPU,true ) {
X+        DEFINES += NVIDIA_GPGPU
X+    }
X+
X+    #for qt theme support
X+        contains( JAHTHEMES,true ) {
X+        DEFINES += JAHTHEMES
X+    }
X+
X+    #for jahplayer support
X+    contains( JAHPLAYER,true ) {
X+        DEFINES += JAHPLAYER
X+    }
X+}
X+
X ###############################################################
X # Sgi Irix old Qt specific settings here
X 
END-of-jahshaka/files/patch-jahshakaSettings.pro
echo x - jahshaka/files/patch-jah_libraries_jahaudio_sndfile.h
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_sndfile.h << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_sndfile.h'
X--- jah/libraries/jahaudio/sndfile.h.orig
X+++ jah/libraries/jahaudio/sndfile.h
X@@ -233,7 +233,7 @@
X ** off64_t (Solaris), __int64_t (Win32) etc.
X */
X 
X-typedef loff_t	sf_count_t ;
X+typedef off_t	sf_count_t ;
X 
X #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
X 
END-of-jahshaka/files/patch-jah_libraries_jahaudio_sndfile.h
echo x - jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.cpp
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.cpp << 'END-of-jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.cpp'
X--- jah/libraries/jahtimer/jahtimer.cpp.orig
X+++ jah/libraries/jahtimer/jahtimer.cpp
X@@ -11,18 +11,22 @@
X 
X void JahTimer::starttime( void ) 
X { 
X-    ftime(&current_time); 
X-    start_time = (int)current_time.millitm; 
X+struct timezone tz;
X 
X-    start_time_float = (double)current_time.time + ((double)current_time.millitm / 1000.0);
X+    gettimeofday(&current_time,&tz); 
X+    start_time = (int)current_time.tv_usec; 
X+
X+    start_time_float = (double)current_time.tv_sec + ((double)current_time.tv_usec / 1000.0);
X 
X }
X 
X void JahTimer::endtime  ( void ) 
X { 
X-    ftime(&current_time);
X-    end_time = (int)current_time.millitm;
X-    end_time_float = (double)current_time.time + ((double)current_time.millitm / 1000.0);
X+struct timezone tz;
X+
X+    gettimeofday(&current_time,&tz);
X+    end_time = (int)current_time.tv_usec;
X+    end_time_float = (double)current_time.tv_sec + ((double)current_time.tv_usec / 1000.0);
X     total_time_float = end_time_float - start_time_float;
X }
X 
END-of-jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.cpp
echo x - jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.h
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.h << 'END-of-jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.h'
X--- jah/libraries/jahtimer/jahtimer.h.orig
X+++ jah/libraries/jahtimer/jahtimer.h
X@@ -10,7 +10,7 @@
X #define JAHTIMER_H
X 
X #include <qstring.h>
X-#include <sys/timeb.h>
X+#include <sys/time.h>
X 
X #include "jahtracer.h"
X 
X@@ -28,7 +28,8 @@
X     
X private:
X 
X-    timeb                           current_time;
X+    struct timeval		current_time;
X+    //timeb                           current_time;
X     //static timeb                  current_time;
X     
X     //used for timing effects
END-of-jahshaka/files/patch-jah_libraries_jahtimer_jahtimer.h
echo x - jahshaka/files/patch-jah_libraries_jahaudio_common.h
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_common.h << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_common.h'
X--- jah/libraries/jahaudio/common.h.orig
X+++ jah/libraries/jahaudio/common.h
X@@ -117,7 +117,7 @@
X typedef struct
X {	unsigned int	version ;	/* version of the PEAK chunk */
X 	unsigned int	timestamp ;	/* secs since 1/1/1970  */
X-	PEAK_POS		peaks [] ;	/* the per channel peak info */
X+	PEAK_POS	*	peaks ;	/* the per channel peak info */
X } PEAK_CHUNK ;
X 
X typedef struct
END-of-jahshaka/files/patch-jah_libraries_jahaudio_common.h
echo x - jahshaka/files/patch-jah_libraries_jahaudio_ima__adpcm.c
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_ima__adpcm.c << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_ima__adpcm.c'
X--- jah/libraries/jahaudio/ima_adpcm.c.orig
X+++ jah/libraries/jahaudio/ima_adpcm.c
X@@ -36,7 +36,7 @@
X 	int				stepindx [2] ;
X 	unsigned char	*block ;
X 	short			*samples ;
X-	unsigned short	data	[] ; /* ISO C99 struct hack */
X+	unsigned short	*data ; /* ISO C99 struct hack */
X } IMA_ADPCM_PRIVATE ;
X 
X /*============================================================================================
END-of-jahshaka/files/patch-jah_libraries_jahaudio_ima__adpcm.c
echo x - jahshaka/files/patch-jah_libraries_jahaudio_ms__adpcm.c
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_ms__adpcm.c << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_ms__adpcm.c'
X--- jah/libraries/jahaudio/ms_adpcm.c.orig
X+++ jah/libraries/jahaudio/ms_adpcm.c
X@@ -43,7 +43,7 @@
X 	sf_count_t			samplecount ;
X 	short			*samples ;
X 	unsigned char	*block ;
X-	unsigned short	dummydata [] ; /* ISO C99 struct hack */
X+	unsigned short	*dummydata ; /* ISO C99 struct hack */
X } MSADPCM_PRIVATE ;
X 
X /*============================================================================================
END-of-jahshaka/files/patch-jah_libraries_jahaudio_ms__adpcm.c
echo x - jahshaka/files/patch-jah_libraries_jahaudio_paf.c
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_paf.c << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_paf.c'
X--- jah/libraries/jahaudio/paf.c.orig
X+++ jah/libraries/jahaudio/paf.c
X@@ -64,7 +64,7 @@
X 	sf_count_t		sample_count ;
X 	int				*samples ;
X 	unsigned char	*block ;
X-	int				data [] ; /* ISO C99 struct hack */
X+	int				*data ; /* ISO C99 struct hack */
X } PAF24_PRIVATE ;
X 
X /*------------------------------------------------------------------------------
END-of-jahshaka/files/patch-jah_libraries_jahaudio_paf.c
echo x - jahshaka/files/patch-jah_libraries_jahaudio_alaw.c
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_alaw.c << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_alaw.c'
X--- jah/libraries/jahaudio/alaw.c.orig
X+++ jah/libraries/jahaudio/alaw.c
X@@ -521,9 +521,9 @@
X {	while (count)
X 	{	count -- ;
X 		if (ptr [count] >= 0)
X-			buffer [count] = alaw_encode [(lrintf (normfact * ptr [count])) / 16] ;
X+			buffer [count] = alaw_encode [(int)((lrintf (normfact * ptr [count])) / 16)] ;
X 		else
X-			buffer [count] = 0x7F & alaw_encode [(lrintf (normfact * ptr [count])) / -16] ;
X+			buffer [count] = 0x7F & alaw_encode [(int)((lrintf (normfact * ptr [count])) / -16)] ;
X 		} ;
X } /* f2alaw_array */
X 
X@@ -532,9 +532,9 @@
X {	while (count)
X 	{	count -- ;
X 		if (ptr [count] >= 0)
X-			buffer [count] = alaw_encode [(lrint (normfact * ptr [count])) / 16] ;
X+			buffer [count] = alaw_encode [(int)((lrint (normfact * ptr [count])) / 16)] ;
X 		else
X-			buffer [count] = 0x7F & alaw_encode [(lrint (normfact * ptr [count])) / -16] ;
X+			buffer [count] = 0x7F & alaw_encode [(int)((lrint (normfact * ptr [count])) / -16)] ;
X 		} ;
X } /* d2alaw_array */
X 
END-of-jahshaka/files/patch-jah_libraries_jahaudio_alaw.c
echo x - jahshaka/files/patch-jah_libraries_jahaudio_config.h
sed 's/^X//' >jahshaka/files/patch-jah_libraries_jahaudio_config.h << 'END-of-jahshaka/files/patch-jah_libraries_jahaudio_config.h'
X--- jah/libraries/jahaudio/config.h.orig
X+++ jah/libraries/jahaudio/config.h
X@@ -81,10 +81,10 @@
X #define HAVE_LIBM 1
X 
X /* Define if you have C99's lrint function. */
X-#define HAVE_LRINT 1
X+//#define HAVE_LRINT 1
X 
X /* Define if you have C99's lrintf function. */
X-#define HAVE_LRINTF 1
X+//#define HAVE_LRINTF 1
X 
X /* Define to 1 if you have the `lseek' function. */
X #define HAVE_LSEEK 1
END-of-jahshaka/files/patch-jah_libraries_jahaudio_config.h
echo x - jahshaka/files/patch-jah_Source_jahshaka.cpp
sed 's/^X//' >jahshaka/files/patch-jah_Source_jahshaka.cpp << 'END-of-jahshaka/files/patch-jah_Source_jahshaka.cpp'
X--- jah/Source/jahshaka.cpp.orig
X+++ jah/Source/jahshaka.cpp
X@@ -185,6 +185,8 @@
X     QString fileinfo;
X     bool    foundpath;
X 
X+#if !defined(__FreeBSD__)
X+
X     //this hack gets the application exectuable path
X     //since QApplication::applicationFilePath() only works on Qt 3.2 and up
X     jtrace.debug("QT_VERSION_STR: ");
X@@ -356,6 +358,13 @@
X         jtrace.debug( "Didnt find media folder, using default media folder" );
X         JahMediaPath = JahBasePath;
X     }
X+
X+#else
X+
X+    JahBasePath  = "%%DATADIR%%/";
X+    JahMediaPath = JahBasePath;
X+
X+#endif
X 
X     //update preferences object with info
X     jprefs.setBasePath(JahBasePath);
END-of-jahshaka/files/patch-jah_Source_jahshaka.cpp
exit

--- jahshaka.shar ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list