Updated several ebuilds
This commit is contained in:
layman
@@ -0,0 +1,4 @@
|
||||
AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 SHA256 65798b9c6070d53957d46b0cac834e1ab9bd4014fab50773ac83b4d1babe00a6 SHA512 b49e8742627b6e0d56efd455230f78cb49a3337a376da39d9b77869835c1d34b8f4a826ae0f888fe0f81ce011a3f0e6dcf52479c34813594129fb2916c782c57 WHIRLPOOL 4310ce8d881f29f4185a9fc7aa6c8cd280bd4ecbc09a98f0517ba4c9b1b50d02a29481768f3cd40976482d7a30dc3c4b137b4d63415f930cbcb42ef3770ea352
|
||||
DIST vcdimager-0.7.24.tar.gz 1066815 SHA256 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214 WHIRLPOOL b94f3937415ec1b178484adfc653b1846e9f52ed95fd0677fa5f7b077b345f4cbd3b11526bb9b9011b76f74a916644e9d60dec3ce37571ed97523db04cb5ec42
|
||||
EBUILD vcdimager-0.7.24.ebuild 1469 SHA256 752485f477184fca70d9566332797ae9a631c0030d24f9e70db48ef81ffa750e SHA512 c354a833d0558bd0f057ec5667aee3ecb97890de50c2cc55db23b9ce1f98e5034c49c26d4ad50719c60132e4656721211f0810d54226972f89ecb7b40fba4e24 WHIRLPOOL 672f68af2a98acf5d45909f17e393027b14def6019e4b61f332b064985162e652a6ef3207c519bfbd9a09efe512728afc69a56925e0a9f68f8721a8ced5e8703
|
||||
MISC metadata.xml 223 SHA256 7d0451c70b262d8928fbd11c938e6b5663794345ad10f7be8533ab42b521e42c SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db WHIRLPOOL 0b20f52f85830d008257e03325b74780038fc6e0bf6cc3917aa7f0d8621673c87bebcf201ca0cd876276febe9fcf785fe8f80de1889f2009fdd5bd05c2615d17
|
||||
@@ -0,0 +1,230 @@
|
||||
diff --git a/frontends/xml/vcd_xml_rip.c b/frontends/xml/vcd_xml_rip.c
|
||||
index 3d28065..f1be95d 100644
|
||||
--- a/frontends/xml/vcd_xml_rip.c
|
||||
+++ b/frontends/xml/vcd_xml_rip.c
|
||||
@@ -769,7 +769,7 @@ _visit_lot (pbc_ctx_t *p_pbc_ctx)
|
||||
_visit_pbc (p_pbc_ctx, n + 1, tmp, true);
|
||||
|
||||
_vcd_list_sort (p_pbc_ctx->offset_list,
|
||||
- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
|
||||
+ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
|
||||
}
|
||||
|
||||
static int
|
||||
diff --git a/include/libvcd/info.h b/include/libvcd/info.h
|
||||
index 2d70940..b62d541 100644
|
||||
--- a/include/libvcd/info.h
|
||||
+++ b/include/libvcd/info.h
|
||||
@@ -455,12 +455,12 @@ extern "C" {
|
||||
/*!
|
||||
Get the VCD info list.
|
||||
*/
|
||||
- CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
|
||||
+ CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
|
||||
|
||||
/*!
|
||||
Get the VCD info extended offset list.
|
||||
*/
|
||||
- CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
|
||||
+ CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
|
||||
|
||||
/*!
|
||||
Get the VCD info offset multiplier.
|
||||
diff --git a/lib/data_structures.c b/lib/data_structures.c
|
||||
index 4415ae1..cef7381 100644
|
||||
--- a/lib/data_structures.c
|
||||
+++ b/lib/data_structures.c
|
||||
@@ -58,7 +58,7 @@ struct _CdioListNode
|
||||
/* impl */
|
||||
|
||||
static bool
|
||||
-_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
|
||||
+_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
|
||||
{
|
||||
CdioListNode_t **pp_node;
|
||||
bool changed = false;
|
||||
@@ -86,7 +86,7 @@ _bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
|
||||
return changed;
|
||||
}
|
||||
|
||||
-void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func)
|
||||
+void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
|
||||
{
|
||||
/* fixme -- this is bubble sort -- worst sorting algo... */
|
||||
|
||||
@@ -263,7 +263,7 @@ _vcd_tree_node_sort_children (VcdTreeNode_t *p_node,
|
||||
vcd_assert (p_node != NULL);
|
||||
|
||||
if (p_node->children)
|
||||
- _vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func);
|
||||
+ _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/lib/data_structures.h b/lib/data_structures.h
|
||||
index d0932a9..eb5ba48 100644
|
||||
--- a/lib/data_structures.h
|
||||
+++ b/lib/data_structures.h
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
CdioListNode_t *_vcd_list_at (CdioList_t *list, int idx);
|
||||
|
||||
-void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func);
|
||||
+void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func);
|
||||
|
||||
/* n-way tree */
|
||||
|
||||
diff --git a/lib/dict.h b/lib/dict.h
|
||||
index c3e2ce3..fa003f6 100644
|
||||
--- a/lib/dict.h
|
||||
+++ b/lib/dict.h
|
||||
@@ -88,7 +88,7 @@ _dict_get_bykey (VcdObj_t *obj, const char key[])
|
||||
vcd_assert (key != NULL);
|
||||
|
||||
node = _cdio_list_find (obj->buffer_dict_list,
|
||||
- (_cdio_list_iterfunc) _dict_key_cmp,
|
||||
+ (_cdio_list_iterfunc_t) _dict_key_cmp,
|
||||
(char *) key);
|
||||
|
||||
if (node)
|
||||
@@ -106,7 +106,7 @@ _dict_get_bysector (VcdObj_t *obj, uint32_t sector)
|
||||
vcd_assert (sector != SECTOR_NIL);
|
||||
|
||||
node = _cdio_list_find (obj->buffer_dict_list,
|
||||
- (_cdio_list_iterfunc) _dict_sector_cmp,
|
||||
+ (_cdio_list_iterfunc_t) _dict_sector_cmp,
|
||||
§or);
|
||||
|
||||
if (node)
|
||||
diff --git a/lib/files.c b/lib/files.c
|
||||
index 79fa8fe..61e8077 100644
|
||||
--- a/lib/files.c
|
||||
+++ b/lib/files.c
|
||||
@@ -634,7 +634,7 @@ get_search_dat_size (const VcdObj_t *p_vcdobj)
|
||||
+ (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));
|
||||
}
|
||||
|
||||
-static CdioList *
|
||||
+static CdioList_t *
|
||||
_make_track_scantable (const VcdObj_t *p_vcdobj)
|
||||
{
|
||||
CdioList_t *p_all_aps = _cdio_list_new ();
|
||||
diff --git a/lib/image_bincue.c b/lib/image_bincue.c
|
||||
index 69091b3..4e4d460 100644
|
||||
--- a/lib/image_bincue.c
|
||||
+++ b/lib/image_bincue.c
|
||||
@@ -88,7 +88,7 @@ _sink_free (void *user_data)
|
||||
}
|
||||
|
||||
static int
|
||||
-_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
|
||||
+_set_cuesheet (void *user_data, const CdioList_t *vcd_cue_list)
|
||||
{
|
||||
_img_bincue_snk_t *_obj = user_data;
|
||||
CdioListNode_t *node;
|
||||
@@ -102,7 +102,7 @@ _set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
|
||||
|
||||
track_no = 0;
|
||||
index_no = 0;
|
||||
- _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
|
||||
+ _CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list)
|
||||
{
|
||||
const vcd_cue_t *_cue = _cdio_list_node_data (node);
|
||||
char *psz_msf;
|
||||
diff --git a/lib/info_private.c b/lib/info_private.c
|
||||
index 648ef27..53edff7 100644
|
||||
--- a/lib/info_private.c
|
||||
+++ b/lib/info_private.c
|
||||
@@ -136,7 +136,7 @@ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj)
|
||||
ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
|
||||
|
||||
_vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,
|
||||
- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
|
||||
+ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
|
||||
|
||||
/* Now really complete the offset table with LIDs. This routine
|
||||
might obviate the need for vcdinf_visit_pbc() or some of it which is
|
||||
diff --git a/lib/mpeg.h b/lib/mpeg.h
|
||||
index 0425db6..7df668a 100644
|
||||
--- a/lib/mpeg.h
|
||||
+++ b/lib/mpeg.h
|
||||
@@ -103,7 +103,7 @@ typedef struct {
|
||||
unsigned vbvsize;
|
||||
bool constrained_flag;
|
||||
|
||||
- CdioList *aps_list; /* filled up by vcd_mpeg_source */
|
||||
+ CdioList_t *aps_list; /* filled up by vcd_mpeg_source */
|
||||
double last_aps_pts; /* temp, see ->packet */
|
||||
|
||||
} shdr[3];
|
||||
diff --git a/lib/mpeg_stream.c b/lib/mpeg_stream.c
|
||||
index 8384780..2ee3f41 100644
|
||||
--- a/lib/mpeg_stream.c
|
||||
+++ b/lib/mpeg_stream.c
|
||||
@@ -270,7 +270,7 @@ vcd_mpeg_source_scan (VcdMpegSource_t *obj, bool strict_aps, bool fix_scan_info,
|
||||
}
|
||||
|
||||
static double
|
||||
-_approx_pts (CdioList *aps_list, uint32_t packet_no)
|
||||
+_approx_pts (CdioList_t *aps_list, uint32_t packet_no)
|
||||
{
|
||||
double retval = 0;
|
||||
CdioListNode_t *node;
|
||||
@@ -324,7 +324,7 @@ _set_scan_msf (msf_t *_msf, long lsn)
|
||||
|
||||
static void
|
||||
_fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
|
||||
- unsigned packet_no, double pts, CdioList *aps_list)
|
||||
+ unsigned packet_no, double pts, CdioList_t *aps_list)
|
||||
{
|
||||
CdioListNode_t *node;
|
||||
long _next = -1, _prev = -1, _forw = -1, _back = -1;
|
||||
diff --git a/lib/vcd.c b/lib/vcd.c
|
||||
index 4936c09..b1545a0 100644
|
||||
--- a/lib/vcd.c
|
||||
+++ b/lib/vcd.c
|
||||
@@ -583,7 +583,7 @@ vcd_obj_add_sequence_pause (VcdObj_t *obj, const char sequence_id[],
|
||||
}
|
||||
|
||||
_vcd_list_sort (p_sequence->pause_list,
|
||||
- (_cdio_list_cmp_func) _pause_cmp);
|
||||
+ (_cdio_list_cmp_func_t) _pause_cmp);
|
||||
|
||||
vcd_debug ("added autopause point at %f", pause_time);
|
||||
|
||||
@@ -623,7 +623,7 @@ vcd_obj_add_segment_pause (VcdObj_t *p_obj, const char segment_id[],
|
||||
}
|
||||
|
||||
_vcd_list_sort (_segment->pause_list,
|
||||
- (_cdio_list_cmp_func) _pause_cmp);
|
||||
+ (_cdio_list_cmp_func_t) _pause_cmp);
|
||||
|
||||
vcd_debug ("added autopause point at %f", pause_time);
|
||||
|
||||
@@ -685,7 +685,7 @@ vcd_obj_add_sequence_entry (VcdObj_t *p_obj, const char sequence_id[],
|
||||
}
|
||||
|
||||
_vcd_list_sort (p_sequence->entry_list,
|
||||
- (_cdio_list_cmp_func) _entry_cmp);
|
||||
+ (_cdio_list_cmp_func_t) _entry_cmp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1001,7 +1001,7 @@ vcd_obj_add_dir (VcdObj_t *p_obj, const char iso_pathname[])
|
||||
_cdio_list_append (p_obj->custom_dir_list, _iso_pathname);
|
||||
|
||||
_vcd_list_sort (p_obj->custom_dir_list,
|
||||
- (_cdio_list_cmp_func) strcmp);
|
||||
+ (_cdio_list_cmp_func_t) strcmp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -2290,7 +2290,7 @@ vcd_obj_write_image (VcdObj_t *p_obj, VcdImageSink_t *p_image_sink,
|
||||
/* start with meta info */
|
||||
|
||||
{
|
||||
- CdioList *p_cue_list;
|
||||
+ CdioList_t *p_cue_list;
|
||||
vcd_cue_t *p_cue;
|
||||
|
||||
p_cue_list = _cdio_list_new ();
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>media-video@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit eutils multilib-minimal
|
||||
|
||||
DESCRIPTION="GNU VCDimager"
|
||||
HOMEPAGE="http://www.vcdimager.org/"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="+xml static-libs"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
|
||||
dev-libs/popt
|
||||
xml? ( dev-libs/libxml2:2 )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
|
||||
|
||||
src_prepare() {
|
||||
# Avoid building useless programs. Bug #226249
|
||||
sed -i \
|
||||
-e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
|
||||
-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
|
||||
test/Makefile.in || die
|
||||
sed -i \
|
||||
-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
|
||||
example/Makefile.in || die
|
||||
|
||||
epatch "${FILESDIR}"/$P-libcdio-1.0.0.patch
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# We disable the xmltest because the configure script includes differently
|
||||
# than the actual XML-frontend C files.
|
||||
local myconf
|
||||
if use xml && multilib_is_native_abi ; then
|
||||
myconf="--with-xml-prefix=${EPREFIX}/usr --disable-xmltest"
|
||||
else
|
||||
myconf="--without-xml-frontend"
|
||||
fi
|
||||
multilib_is_native_abi || myconf="${myconf} --without-cli-frontend"
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf $(use_enable static-libs static) ${myconf}
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files
|
||||
einstalldocs
|
||||
}
|
||||
Reference in New Issue
Block a user