Attachment #131506 for bug #175586

View | Details | Raw Unified | Return to bug 175586
Collapse All | Expand All




# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
# Date created:			Mon Dec 29 05:07:17 CET 2003
# Whom:				Markus Brueffer <brueffer@phoenix-systems.de>
#
# $FreeBSD: head/print/kover/Makefile 300897 2012-07-14 14:29:18Z beat $

PORTNAME=	kover
PORTVERSION=	6
PORTREVISION=	1
CATEGORIES=	print kde
MASTER_SITES=	http://lisas.de/kover/



LICENSE=	GPLv2

LIB_DEPENDS=	cddb:${PORTSDIR}/audio/libcddb \
		cdio:${PORTSDIR}/sysutils/libcdio

USE_BZIP2=	yes
USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
USE_QT4=	corelib dbus gui network svg xml \
		qmake_build uic_build rcc_build
USE_PERL5_BUILD=yes
USE_GETTEXT=	yes
USE_CMAKE=	yes
MAKE_JOBS_SAFE=	yes

MAN1=		kover.1

post-patch:
	@${REINPLACE_CMD} -e \
		'/libcdio/s|>=.*)|)|' ${WRKSRC}/src/CMakeLists.txt

post-install:
	-update-mime-database ${PREFIX}/share/mime

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)print/kover/distinfo (-2 / +2 lines)
1	SHA256 (kover-4.tar.bz2) = dd73d80eca21a23cc4206b9cbe3bf19071bf02e3dbbb0b808b719e84309c5a6f	1	SHA256 (kover-6.tar.bz2) = 87494299d5dd7a51bbf3a1739f372da680744f14271c43d8495eca15f1f2480a
2	SIZE (kover-4.tar.bz2) = 87141	2	SIZE (kover-6.tar.bz2) = 87898




--- src/cddb_fill.cc.orig
+++ src/cddb_fill.cc
@@ -30,6 +30,9 @@
 #include <string>
 #include <algorithm>
 #include <cdio/cdio.h>
+#if LIBCDIO_VERSION_NUM < 90
+#include <cdio/cdda.h>
+#endif
 #include <cdio/cdtext.h>
 
 using namespace std;
@@ -93,17 +96,39 @@
 	kprintf("device %p\n", cdio);
 
 	/* get disc artist and title */
+#if LIBCDIO_VERSION_NUM < 90
+	cdtext_t *cdtext = cdio_get_cdtext(cdio, 0);
+#else
 	cdtext_t *cdtext = cdio_get_cdtext(cdio);
+#endif
 	if (cdtext) {
+#if LIBCDIO_VERSION_NUM < 90
+		if (cdtext->field[CDTEXT_PERFORMER])
+			cd_info.artist = cdtext->field[CDTEXT_PERFORMER];
+		if (cdtext->field[CDTEXT_TITLE])
+			cd_info.cdname = cdtext->field[CDTEXT_TITLE];
+		if (cdtext->field[CDTEXT_DISCID])
+			cd_info.cddb_id =
+				strtoul(cdtext->field[CDTEXT_DISCID], NULL, 16);
+#else
 		cd_info.artist = cdtext_get(cdtext, CDTEXT_FIELD_PERFORMER, 0);
 		cd_info.cdname = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, 0);
 		cd_info.cddb_id = strtoul(cdtext_get(cdtext, CDTEXT_FIELD_DISCID, 0), NULL, 16);
+#endif
 	}
 
 	for (int i = 1; i <= cd_info.ntracks; i++) {
+#if LIBCDIO_VERSION_NUM < 90
+		cdtext_t *cdtext = cdio_get_cdtext(cdio, i);
+#endif
 		trackinfo *blub = new trackinfo();
 		blub->track = i;
+#if LIBCDIO_VERSION_NUM < 90
+		if (cdtext->field[CDTEXT_TITLE])
+			blub->name = cdtext->field[CDTEXT_TITLE];
+#else
 		blub->name = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, i);
+#endif
 		cd_info.tracks.push_back(blub);
 
 	}

Lines 13-18 Link Here

(-)print/kover/pkg-plist (+8 lines)
13	share/icons/kover_one_page.png	13	share/icons/kover_one_page.png
14	share/icons/locolor/16x16/apps/kover.png	14	share/icons/locolor/16x16/apps/kover.png
15	share/icons/locolor/32x32/apps/kover.png	15	share/icons/locolor/32x32/apps/kover.png
		16	share/locale/de/LC_MESSAGES/kover.mo
		17	share/locale/es/LC_MESSAGES/kover.mo
		18	share/locale/fr/LC_MESSAGES/kover.mo
		19	share/locale/it/LC_MESSAGES/kover.mo
		20	share/locale/nb/LC_MESSAGES/kover.mo
		21	share/locale/pl/LC_MESSAGES/kover.mo
16	share/mime/packages/kover.xml	22	share/mime/packages/kover.xml
17	@dirrmtry share/icons/locolor/32x32/apps	23	@dirrmtry share/icons/locolor/32x32/apps
18	@dirrmtry share/icons/locolor/32x32	24	@dirrmtry share/icons/locolor/32x32
Lines 20-22 Link Here
20	@dirrmtry share/icons/locolor/16x16	26	@dirrmtry share/icons/locolor/16x16
21	@dirrmtry share/icons/locolor	27	@dirrmtry share/icons/locolor
22	@dirrm share/apps/kover	28	@dirrm share/apps/kover
		29	@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
		30	@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime

Return to bug 175586

Lines 1-12 Link Here

(-)print/kover/Makefile (-8 / +12 lines)
1	# New ports collection makefile for: kover	1	# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
2	# Date created: Mon Dec 29 05:07:17 CET 2003
3	# Whom: Markus Brueffer <brueffer@phoenix-systems.de>
4	#
5	# $FreeBSD: head/print/kover/Makefile 300897 2012-07-14 14:29:18Z beat $	2	# $FreeBSD: head/print/kover/Makefile 300897 2012-07-14 14:29:18Z beat $
6		3
7	PORTNAME= kover	4	PORTNAME= kover
8	PORTVERSION= 4	5	PORTVERSION= 6
9	PORTREVISION= 1
10	CATEGORIES= print kde	6	CATEGORIES= print kde
11	MASTER_SITES= http://lisas.de/kover/	7	MASTER_SITES= http://lisas.de/kover/
12		8
Lines 15-31 Link Here
15		11
16	LICENSE= GPLv2	12	LICENSE= GPLv2
17		13
18	LIB_DEPENDS= cddb.4:${PORTSDIR}/audio/libcddb \	14	LIB_DEPENDS= cddb:${PORTSDIR}/audio/libcddb \
19	cdio.13:${PORTSDIR}/sysutils/libcdio	15	cdio:${PORTSDIR}/sysutils/libcdio
20		16
21	USE_BZIP2= yes	17	USE_BZIP2= yes
22	USE_KDE4= automoc4 kdehier kdeprefix kdelibs	18	USE_KDE4= automoc4 kdehier kdeprefix kdelibs
23	USE_QT4= corelib dbus gui network svg xml \	19	USE_QT4= corelib dbus gui network svg xml \
24	qmake_build uic_build rcc_build	20	qmake_build uic_build rcc_build
25	USE_PERL5_BUILD=yes	21	USE_PERL5_BUILD=yes
		22	USE_GETTEXT= yes
26	USE_CMAKE= yes	23	USE_CMAKE= yes
27	MAKE_JOBS_SAFE= yes	24	MAKE_JOBS_SAFE= yes
28		25
29	MAN1= kover.1	26	MAN1= kover.1
30		27
		28	post-patch:
		29	@${REINPLACE_CMD} -e \
		30	'/libcdio/s\|>=.*)\|)\|' ${WRKSRC}/src/CMakeLists.txt
		31
		32	post-install:
		33	-update-mime-database ${PREFIX}/share/mime
		34
31	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Line 0 Link Here

(-)print/kover/files/patch-cddb_fill.cc (+52 lines)
	1	--- src/cddb_fill.cc.orig
	2	+++ src/cddb_fill.cc
	3	@@ -30,6 +30,9 @@
	4	#include <string>
	5	#include <algorithm>
	6	#include <cdio/cdio.h>
	7	+#if LIBCDIO_VERSION_NUM < 90
	8	+#include <cdio/cdda.h>
	9	+#endif
	10	#include <cdio/cdtext.h>
	11
	12	using namespace std;
	13	@@ -93,17 +96,39 @@
	14	kprintf("device %p\n", cdio);
	15
	16	/* get disc artist and title */
	17	+#if LIBCDIO_VERSION_NUM < 90
	18	+ cdtext_t *cdtext = cdio_get_cdtext(cdio, 0);
	19	+#else
	20	cdtext_t *cdtext = cdio_get_cdtext(cdio);
	21	+#endif
	22	if (cdtext) {
	23	+#if LIBCDIO_VERSION_NUM < 90
	24	+ if (cdtext->field[CDTEXT_PERFORMER])
	25	+ cd_info.artist = cdtext->field[CDTEXT_PERFORMER];
	26	+ if (cdtext->field[CDTEXT_TITLE])
	27	+ cd_info.cdname = cdtext->field[CDTEXT_TITLE];
	28	+ if (cdtext->field[CDTEXT_DISCID])
	29	+ cd_info.cddb_id =
	30	+ strtoul(cdtext->field[CDTEXT_DISCID], NULL, 16);
	31	+#else
	32	cd_info.artist = cdtext_get(cdtext, CDTEXT_FIELD_PERFORMER, 0);
	33	cd_info.cdname = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, 0);
	34	cd_info.cddb_id = strtoul(cdtext_get(cdtext, CDTEXT_FIELD_DISCID, 0), NULL, 16);
	35	+#endif
	36	}
	37
	38	for (int i = 1; i <= cd_info.ntracks; i++) {
	39	+#if LIBCDIO_VERSION_NUM < 90
	40	+ cdtext_t *cdtext = cdio_get_cdtext(cdio, i);
	41	+#endif
	42	trackinfo *blub = new trackinfo();
	43	blub->track = i;
	44	+#if LIBCDIO_VERSION_NUM < 90
	45	+ if (cdtext->field[CDTEXT_TITLE])
	46	+ blub->name = cdtext->field[CDTEXT_TITLE];
	47	+#else
	48	blub->name = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, i);
	49	+#endif
	50	cd_info.tracks.push_back(blub);
	51
	52	}