sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 0.9.3.

Browse source 
- Removed files:

- files/patch-src-dcmtk_interface.cc
- files/patch-src-mpeg_encode.c
- files/patch-src-ui_common.c

PR:		ports/156963
Submitted by:	Guido Falsi <mad@madpilot.net> (maintainer)
This commit is contained in:
Sylvio Cesar Teixeira 2011-05-13 14:37:57 +00:00
parent 39032cb906
commit ab755208c5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=274053
6 changed files with 8 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/amide/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= amide
PORTVERSION= 0.9.2
PORTREVISION= 1
PORTVERSION= 0.9.3
CATEGORIES= graphics
MASTER_SITES= SF
EXTRACT_SUFX= .tgz

4
graphics/amide/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (amide-0.9.2.tgz) = bbe230b7aef3c65ef2014d561a09d97b96e50ec4f1a09c16b4de751974ff01be
SIZE (amide-0.9.2.tgz) = 1476952
SHA256 (amide-0.9.3.tgz) = f664ff89363e96452a94775f645f6ca2bcee628b19f1d72258545bb715da6602
SIZE (amide-0.9.3.tgz) = 1635189

30
graphics/amide/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2009-12-09 07:35:12.000000000 +0100
+++ configure 2011-02-10 18:25:18.165872253 +0100
@@ -17889,13 +17889,13 @@
--- configure.orig 2011-01-20 03:24:42.000000000 +0100
+++ configure 2011-05-10 15:10:45.000000000 +0200
@@ -15399,13 +15399,13 @@
DATADIRNAME=share
else
CATOBJEXT=.mo
@ -16,8 +16,8 @@
;;
esac
fi
@@ -18684,12 +18684,12 @@
if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
@@ -16063,12 +16063,12 @@
if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
else
- DATADIRNAME=lib
@ -31,23 +31,3 @@
;;
esac
fi
@@ -19625,7 +19625,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldcmdata -lofstd -lz -L/usr/local/dicom/lib -L/sw/lib $THREAD_LIBS $LIBS"
+LIBS="-ldcmdata -lofstd -loflog -lz -L/usr/local/lib $THREAD_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20391,8 +20391,8 @@
if (test $enable_libdcmdata = yes) && (test $FOUND_DCMDATA = yes); then
echo "Compiling with DCMTK support for DICOM files"
- AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -lz $THREAD_LIBS"
- AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk"
+ AMIDE_LIBDCMDATA_LIBS="-L/usr/local/lib -ldcmdata -lofstd -loflog -lz $THREAD_LIBS"
+ AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/include"

115
graphics/amide/files/patch-src-dcmtk_interface.cc
View file

@ -1,115 +0,0 @@
--- src/dcmtk_interface.cc.orig 2009-12-14 05:53:11.000000000 +0100
+++ src/dcmtk_interface.cc 2011-02-11 10:59:18.612565854 +0100
@@ -32,7 +32,7 @@
#include <unistd.h>
#endif
#include "dcmtk_interface.h"
-#include "dcddirif.h" /* for class DicomDirInterface */
+#include "dcmtk/dcmdata/dcddirif.h" /* for class DicomDirInterface */
#include <dirent.h>
#include <sys/stat.h>
#include "amitk_data_set_DOUBLE_0D_SCALING.h"
@@ -44,7 +44,8 @@
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
-#include <dctk.h>
+#include "amide_config.h"
+#include <dcmtk/dcmdata/dctk.h>
//#include <dcostrmb.h>
const gchar * dcmtk_version = OFFIS_DCMTK_VERSION;
@@ -188,7 +189,7 @@
}
dim.y = return_uint16;
- if (dcm_dataset->findAndGetUint16(DCM_Planes, return_uint16).bad())
+ if (dcm_dataset->findAndGetUint16(DCM_RETIRED_Planes, return_uint16).bad())
dim.z = 1;
else
dim.z = return_uint16;
@@ -352,7 +353,7 @@
if (dcm_dataset->findAndGetString(DCM_PatientID, return_str, OFTrue).good())
amitk_data_set_set_subject_id(ds, return_str);
- if (dcm_dataset->findAndGetFloat64(DCM_PatientsWeight, return_float64).good()) {
+ if (dcm_dataset->findAndGetFloat64(DCM_PatientWeight, return_float64).good()) {
amitk_data_set_set_subject_weight(ds, return_float64);
amitk_data_set_set_displayed_weight_unit(ds, AMITK_WEIGHT_UNIT_KILOGRAM);
}
@@ -429,7 +430,7 @@
}
}
- if (dcm_dataset->findAndGetString(DCM_PatientsName, return_str, OFTrue).good()) {
+ if (dcm_dataset->findAndGetString(DCM_PatientName, return_str, OFTrue).good()) {
if (AMITK_OBJECT_NAME(ds) == NULL)
amitk_object_set_name(AMITK_OBJECT(ds), return_str);
amitk_data_set_set_subject_name(ds, return_str);
@@ -495,7 +496,7 @@
}
}
- if (dcm_dataset->findAndGetString(DCM_PatientsBirthDate, return_str, OFTrue).good())
+ if (dcm_dataset->findAndGetString(DCM_PatientBirthDate, return_str, OFTrue).good())
amitk_data_set_set_subject_dob(ds, return_str);
/* because of how the dicom coordinates are setup, after reading in the patient slices,
@@ -1257,7 +1258,7 @@
if (return_str != NULL)
info->patient_id = g_strdup(return_str);
- dcm_dataset->findAndGetString(DCM_PatientsName, return_str, OFTrue);
+ dcm_dataset->findAndGetString(DCM_PatientName, return_str, OFTrue);
if (return_str != NULL)
info->patient_name = g_strdup(return_str);
@@ -1537,7 +1538,7 @@
/* go through the whole directory */
while ((patient_record = dcm_root_record->nextSub(patient_record)) != NULL) {
- patient_record->findAndGetString(DCM_PatientsName, record_name[0]);
+ patient_record->findAndGetString(DCM_PatientName, record_name[0]);
patient_record->findAndGetString(DCM_PatientID, patient_id, OFTrue);
@@ -1802,8 +1803,9 @@
}
#ifdef AMIDE_DEBUG
- dcm_dir.enableVerboseMode(TRUE);
- dcm_dir.setLogStream(&ofConsole);
+// These are not defined in the latest dcmtk and could not find substitutes.
+// dcm_dir.enableVerboseMode(TRUE);
+// dcm_dir.setLogStream(&ofConsole);
#endif
/* create the DICOMDIR, unless already made in which case we'll append to it */
@@ -1905,15 +1907,15 @@
/* other stuff */
if (AMITK_DATA_SET_SUBJECT_NAME(ds) != NULL)
- insert_str(dcm_ds,DCM_PatientsName, AMITK_DATA_SET_SUBJECT_NAME(ds));
+ insert_str(dcm_ds,DCM_PatientName, AMITK_DATA_SET_SUBJECT_NAME(ds));
if (AMITK_DATA_SET_SUBJECT_ID(ds) != NULL)
insert_str(dcm_ds,DCM_PatientID, AMITK_DATA_SET_SUBJECT_ID(ds));
if (AMITK_DATA_SET_SUBJECT_DOB(ds) != NULL)
- insert_str(dcm_ds,DCM_PatientsBirthDate, AMITK_DATA_SET_SUBJECT_DOB(ds));
+ insert_str(dcm_ds,DCM_PatientBirthDate, AMITK_DATA_SET_SUBJECT_DOB(ds));
if (AMITK_OBJECT_NAME(ds) != NULL)
insert_str(dcm_ds,DCM_StudyDescription, AMITK_OBJECT_NAME(ds));
insert_double(dcm_ds,DCM_RadionuclideTotalDose, AMITK_DATA_SET_INJECTED_DOSE(ds));
- insert_double(dcm_ds,DCM_PatientsWeight, AMITK_DATA_SET_SUBJECT_WEIGHT(ds));
+ insert_double(dcm_ds,DCM_PatientWeight, AMITK_DATA_SET_SUBJECT_WEIGHT(ds));
switch(AMITK_DATA_SET_SUBJECT_ORIENTATION(ds)) {
case AMITK_SUBJECT_ORIENTATION_SUPINE_HEADFIRST:
@@ -1949,7 +1951,7 @@
case AMITK_MODALITY_PET:
insert_str(dcm_ds,DCM_Modality, "PT");
dcm_metainfo->putAndInsertString(DCM_MediaStorageSOPClassUID,
- UID_PETImageStorage);
+ UID_EnhancedPETImageStorage);
break;
case AMITK_MODALITY_SPECT:
insert_str(dcm_ds,DCM_Modality, "ST");

11
graphics/amide/files/patch-src-mpeg_encode.c
View file

@ -1,11 +0,0 @@
--- src/mpeg_encode.c.orig 2009-11-16 07:55:52.000000000 +0100
+++ src/mpeg_encode.c 2011-02-08 16:18:47.640994869 +0100
@@ -141,7 +141,7 @@
/* -------------------------------------------------------- */
#ifdef AMIDE_FFMPEG_SUPPORT
-#include <ffmpeg/libavcodec/avcodec.h>
+#include <libavcodec/avcodec.h>
typedef struct {

11
graphics/amide/files/patch-src-ui_common.c
View file

@ -1,11 +0,0 @@
--- src/ui_common.c.orig 2009-11-16 06:00:11.000000000 +0100
+++ src/ui_common.c 2011-02-08 16:21:18.283127798 +0100
@@ -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>