- update amide to 0.9.2

- regen PLIST
- update patch

ok ajacoutot@
This commit is contained in:
benoit 2009-12-23 12:01:07 +00:00
parent 833910e74f
commit 3940040a18
8 changed files with 57 additions and 53 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:44 kili Exp $
# $OpenBSD: Makefile,v 1.4 2009/12/23 12:01:07 benoit Exp $
COMMENT = Amide a Medical Imaging Data Examiner
DISTNAME = amide-0.9.1
PKGNAME = ${DISTNAME}p1
DISTNAME = amide-0.9.2
CATEGORIES = graphics
HOMEPAGE = http://amide.sourceforge.net/
@ -25,7 +24,9 @@ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread ssl stdc++ util xml2 z
WANTLIB += avahi-client avahi-common avahi-glib
WANTLIB += pthread-stubs xcb
WANTLIB += a52 faac faad mp3lame ogg oil-0.3 schroedinger-1.0
WANTLIB += theora vorbis vorbisenc x264
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amide/}
EXTRACT_SUFX = .tgz
@ -40,7 +41,8 @@ RUN_DEPENDS = ::devel/desktop-file-utils \
LIB_DEPENDS = gsl.>=7,gslcblas:gsl->=1.6:devel/gsl \
gnomecanvas-2.>=1400::x11/gnome/libgnomecanvas \
gnomevfs-2.>=2400::x11/gnome/vfs2 \
mdc.>=2::graphics/xmedcon
mdc.>=2::graphics/xmedcon \
avcodec.>=13.1,avformat.>=12,avutil.>=6,swscale.>=1:ffmpeg->=20080620p12:graphics/ffmpeg
USE_X11 = Yes
USE_LIBTOOL = Yes
@ -55,7 +57,8 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-scrollkeeper \
--disable-xmedcontest \
--disable-libfame \
--disable-libdcmdata
--disable-libdcmdata \
--enable-ffmpeg
NO_REGRESS = Yes

View File

@ -1,5 +1,5 @@
MD5 (amide-0.9.1.tgz) = qnzKz4T8h7lw+mUN+Pbi+A==
RMD160 (amide-0.9.1.tgz) = nzmlVfp26Cjl0VWKAMjKBPlzo5o=
SHA1 (amide-0.9.1.tgz) = zKJw7oDQ/4BUooMg5SHGUovLUlY=
SHA256 (amide-0.9.1.tgz) = VhiRpTdDbjhO5EFTtaIfvZdZKZbGGvaFvnja0+A2u5I=
SIZE (amide-0.9.1.tgz) = 1485836
MD5 (amide-0.9.2.tgz) = DUA2TzUBH9ihouh1EqzrHQ==
RMD160 (amide-0.9.2.tgz) = PhT1B2PqOxOVzrVTTl2oLKlg0vs=
SHA1 (amide-0.9.2.tgz) = vrKo+Yd4UJZBI/hv/LS9m/QBS/Y=
SHA256 (amide-0.9.2.tgz) = u+Iwt67zxl7yAU1WGgnZe5blDsTxoJwWtN51GXT/Ab4=
SIZE (amide-0.9.2.tgz) = 1476952

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
--- configure.orig Mon Dec 17 07:55:29 2007
+++ configure Fri Apr 17 13:37:28 2009
@@ -22657,8 +22657,8 @@ fi
$OpenBSD: patch-configure,v 1.2 2009/12/23 12:01:10 benoit Exp $
--- configure.orig Wed Dec 9 07:35:12 2009
+++ configure Fri Dec 18 11:35:20 2009
@@ -18758,8 +18758,8 @@
case "$host_os" in
darwin*) CFLAGS="-g -O2 -Wall";;
darwin*) CFLAGS="-g -O2 -Wall"
LDFLAGS="-headerpad_max_install_names";;
-*) CFLAGS="-g -O6 -Wall"
- CXXFLAGS="-g -O6 -Wall";;
+*) CFLAGS="-g -Wall"
@ -12,16 +12,16 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
esac
if test $CC = "gcc"; then
@@ -23720,13 +23720,13 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_e
@@ -19548,13 +19548,13 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
+$as_echo_n "checking for pthread_mutex_init in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
@ -29,10 +29,10 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23782,7 +23782,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
@@ -19614,7 +19614,7 @@
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
$as_echo "$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
if test "x$ac_cv_lib_pthread_pthread_mutex_init" = x""yes; then
- THREAD_LIBS="-lpthread"
+ THREAD_LIBS="-pthread"
else

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
--- src/Makefile.in.orig Mon Dec 17 07:45:45 2007
+++ src/Makefile.in Fri Apr 17 13:33:41 2009
@@ -374,8 +374,7 @@ AM_CFLAGS = \
$(AMIDE_LIBDCMDATA_CFLAGS) \
-I/usr/local/include \
$(XMEDCON_CFLAGS) \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED
+ -DG_DISABLE_DEPRECATED
AM_CXXFLAGS = $(AM_CFLAGS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_mpeg_encode_c,v 1.1 2009/12/23 12:01:10 benoit Exp $
--- src/mpeg_encode.c.orig Fri Dec 18 11:50:02 2009
+++ src/mpeg_encode.c Fri Dec 18 11:50:19 2009
@@ -141,7 +141,7 @@
/* -------------------------------------------------------- */
#ifdef AMIDE_FFMPEG_SUPPORT
-#include <ffmpeg/libavcodec/avcodec.h>
+#include <libavcodec/avcodec.h>
typedef struct {

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_tb_export_data_set_c,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
--- src/tb_export_data_set.c.orig Mon Dec 3 00:21:38 2007
+++ src/tb_export_data_set.c Fri Apr 17 13:33:41 2009
@@ -178,7 +178,7 @@ static void export_data_set_ok(GtkWidget* widget, gpoi
/* get the filename and import - note DCMTK dicom files we don't want to
complain about file existing, as we might be appending */
filename = ui_common_file_selection_get_save_name(file_selection,
- method!=AMITK_EXPORT_METHOD_DCMTK);
+ method!=TRUE);
if (filename == NULL) return;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_ui_common_c,v 1.1 2009/12/23 12:01:10 benoit Exp $
--- src/ui_common.c.orig Fri Dec 18 11:52:11 2009
+++ src/ui_common.c Fri Dec 18 11:52:24 2009
@@ -46,7 +46,7 @@
#include <medcon.h>
#endif
#ifdef AMIDE_FFMPEG_SUPPORT
-#include <ffmpeg/libavcodec/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif
#ifdef AMIDE_LIBFAME_SUPPORT
#include <fame_version.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/12/23 12:01:12 benoit Exp $
@bin bin/amide
@man man/man1/amide.1
share/applications/amide.desktop
@ -61,3 +61,5 @@ share/omf/amide/amide-es.omf
share/pixmaps/
share/pixmaps/amide_file_logo.png
share/pixmaps/amide_logo.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database