Large rework/update to EAPI=7
This commit is contained in:
layman
@@ -1,3 +0,0 @@
|
||||
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
|
||||
EBUILD avidemux-2.6.20.ebuild 4298 SHA256 09a12e1f571b633688d0f6894d3d8e209e2a284e1fa124e1807158cc28afe615 SHA512 bff5799b66b86b61b61860bbd48c0b14927f25089baec22629f09e322bb1426870bf1098ac0f083d9f476cbcb6fa6f130a8d31ee139cea6ccfbc365710af38a5 WHIRLPOOL 4842dd38d690ca03eb3309e28be56cedbced86be5bf244a0a5a24a224b55078dcdf542a8b07247ae825e0a59a5013ebb1ef898fdd5226a557c1ed6a502aa88f7
|
||||
MISC metadata.xml 489 SHA256 cea0a7554482097ce99fec34fb6abb767c09620acf42d23842285d4efb4ae9f3 SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d WHIRLPOOL f00dfaf7eeaaa1302955b696309f4d3b75ea64b483b0bca62098cb36a1edd4b49fa40043df1968bc6ca2100a085819e105b183e375575bc7a2c73b57170f68a5
|
||||
@@ -1,161 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
|
||||
|
||||
inherit cmake-utils l10n xdg-utils
|
||||
|
||||
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
|
||||
HOMEPAGE="http://fixounet.free.fr/${PN}"
|
||||
|
||||
# Multiple licenses because of all the bundled stuff.
|
||||
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
|
||||
SLOT="2.6"
|
||||
IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
|
||||
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
MY_P="${P}"
|
||||
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
|
||||
|
||||
inherit git-r3
|
||||
else
|
||||
MY_P="${PN}_${PV}"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DEPEND="
|
||||
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
|
||||
opengl? ( virtual/opengl:0 )
|
||||
qt5? ( dev-qt/qtgui:5 )
|
||||
vaapi? ( x11-libs/libva:0 )
|
||||
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
|
||||
"
|
||||
RDEPEND="
|
||||
$DEPEND
|
||||
nls? ( virtual/libintl:0 )
|
||||
"
|
||||
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
processes="buildCli:avidemux/cli"
|
||||
if use qt5 ; then
|
||||
processes+=" buildQt4:avidemux/qt4"
|
||||
fi
|
||||
|
||||
for process in ${processes} ; do
|
||||
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
|
||||
done
|
||||
|
||||
# Fix icon name -> avidemux-2.6.png
|
||||
sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
|
||||
|
||||
# The desktop file is broken. It uses avidemux2 instead of avidemux3
|
||||
# so it will actually launch avidemux-2.5 if it is installed.
|
||||
sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
|
||||
sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
|
||||
|
||||
# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
|
||||
sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
|
||||
|
||||
# Now rename the desktop file to not collide with 2.5.
|
||||
mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
|
||||
|
||||
# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
|
||||
sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Add lax vector typing for PowerPC.
|
||||
if use ppc || use ppc64 ; then
|
||||
append-cflags -flax-vector-conversions
|
||||
fi
|
||||
|
||||
# See bug 432322.
|
||||
use x86 && replace-flags -O0 -O1
|
||||
|
||||
# The build relies on an avidemux-core header that uses 'nullptr'
|
||||
# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
|
||||
append-cxxflags -std=c++14
|
||||
|
||||
local mycmakeargs=(
|
||||
-DAVIDEMUX_SOURCE_DIR='${S}'
|
||||
-DGETTEXT="$(usex nls)"
|
||||
-DSDL="$(usex sdl)"
|
||||
-DLIBVA="$(usex vaapi)"
|
||||
-DVDPAU="$(usex vdpau)"
|
||||
-DXVIDEO="$(usex xv)"
|
||||
)
|
||||
|
||||
if use qt5 ; then
|
||||
mycmakeargs+=( -DENABLE_QT5="$( usex qt5 )" )
|
||||
export QT_SELECT=5
|
||||
fi
|
||||
|
||||
if use debug ; then
|
||||
mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
|
||||
fi
|
||||
|
||||
for process in ${processes} ; do
|
||||
local build="${WORKDIR}/${P}_build/${process%%:*}"
|
||||
CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
for process in ${processes} ; do
|
||||
local build="${WORKDIR}/${P}_build/${process%%:*}"
|
||||
BUILD_DIR="${build}" cmake-utils_src_compile
|
||||
done
|
||||
}
|
||||
|
||||
src_test() {
|
||||
for process in ${processes} ; do
|
||||
local build="${WORKDIR}/${P}_build/${process%%:*}"
|
||||
BUILD_DIR="${build}" cmake-utils_src_test
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
for process in ${processes} ; do
|
||||
local build="${WORKDIR}/${P}_build/${process%%:*}"
|
||||
BUILD_DIR="${build}" cmake-utils_src_install
|
||||
done
|
||||
|
||||
if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
|
||||
fperms +x /usr/bin/avidemux3_cli
|
||||
fi
|
||||
|
||||
if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
|
||||
fperms +x /usr/bin/avidemux3_jobs
|
||||
fi
|
||||
|
||||
cd "${S}" || die "Can't enter source folder."
|
||||
newicon ${PN}_icon.png ${PN}-2.6.png
|
||||
|
||||
if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
|
||||
fperms +x /usr/bin/avidemux3_qt5
|
||||
fi
|
||||
|
||||
if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
|
||||
fperms +x /usr/bin/avidemux3_jobs_qt5
|
||||
fi
|
||||
|
||||
if use qt5 ; then
|
||||
domenu ${PN}-2.6.desktop
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
<?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>
|
||||
<name>Gentoo Video project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">avidemux</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,3 +0,0 @@
|
||||
DIST avinfo-1.0.a15unix-patch1.tar.gz 5665 SHA256 b239c7a414dc92e4a6d3881801e981e71f66242d0e38ffae774a3a0f8c8bdf81 SHA512 9219d7b4a92cc776979b9332cfb286781e4cfada5280bb145377a4d51078895368392fef7c4ff24dc714101617f4aaa0916fd5c19897919af0dfa78f3765a457 WHIRLPOOL 01dbc6622363f427bf4d0139d1f5c7131b6c3310007a36cdbfcf5c3911e9caffe7b4cc61d840472d61b6bdb1a336a6d59c784f99dde200b7a2864f7f80d01e3d
|
||||
DIST avinfo-1.0.a15unix.tar.gz 105743 SHA256 3e3404a76e6057c1703e0c49b63910a8ffcb5ea15ae7b2d0a7d2ede4b4c19887 SHA512 984bb2e8916c1469206163ef9fa37f89d71a842a94a1ebf5a92ded410de4aacaf83d77d790f70624431d5c60305951a3cfbdea075fc2705bbd28250f9f9ade2e WHIRLPOOL 5f93c9b120b037014aef8d6e0268e76fed0197a6d4db2c6f30ec128ad9e4272e037e906dc2335f4951a6b6db2c87860c951753726488193dfacb74ca7274e553
|
||||
EBUILD avinfo-1.0_alpha15_p1.ebuild 950 SHA256 457dce5108daaa42c7e26bef3f41b5eae0da409ae14f8cdabb6aefdc76de8f26 SHA512 81c938eb64c3eb7012cf7d0713b99a5fb46ba2d8565d420934d0b36c5a8135085cba54f8c89fd5650eff9f3731461baf34e63240bac250ed7da1e7234c82a9e8 WHIRLPOOL de34fabd03981274a5d8a9b95a5f4b06bcb41b71b68872ae02961c65d0593b59c33504e4fac9ed229a2b248280c3e408afbb70c8428748da76bb72ad9b6647d2
|
||||
@@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild,v 1.2 2011/11/20 21:32:44 radhermit Exp $
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
MY_P=${PN}-1.0.a15unix
|
||||
|
||||
DESCRIPTION="Utility for displaying AVI information"
|
||||
HOMEPAGE="http://shounen.ru/soft/avinfo/english.shtml"
|
||||
SRC_URI="http://shounen.ru/soft/${PN}/${MY_P}.tar.gz
|
||||
http://shounen.ru/soft/${PN}/${MY_P}-patch1.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE=""
|
||||
|
||||
S="${WORKDIR}"/${PN}-1.0.a15
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
epatch "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff
|
||||
sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin src/avinfo
|
||||
doman src/avinfo.1
|
||||
dodoc CHANGELOG README "${WORKDIR}"/${MY_P}-patch1/FIXES
|
||||
dodoc doc/*
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
DIST devedeng-4.4.0.tar.gz 1882418 SHA256 29c4c66fa23d0386aa9220ad331b0863d3dc897b43b08de023a64ef4405325b9 SHA512 7c820f8dfb1408e9c7d5167b73e34e729e4731bdc2708939920fcc3f0f0d1161618813072f6808959975da40548cd9032516223887bdf70ea41976f28598c08a WHIRLPOOL d8de694cfc46d137791648beae4ef698c07ee81153d68cde25e956672dd5a0b549e4650fb8f2bb653244e0b2b775f1f0119a118130afc60c25b161181d14e068
|
||||
EBUILD devedeng-4.4.0.ebuild 839 SHA256 67cb166b564607681c1c02cdec46450a27a6969b43d5074b618a3c235305935f SHA512 4457c61b549666cefb8e054cc75e1d96c1b3e720efada298a3f0d2faae15db84de211549d5bae77da8ba66af93121528bb2cf0425c557f4f2f6b62e48b44d1e7 WHIRLPOOL c7327711720822d021c78dc8d85a5c5a24e13c69546e59c89c2614e252ed05e32eb677f854f38f3a5f5fdcb3543fa8188c221ee1f05097a8f601d2ed525d5363
|
||||
@@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python3_4 )
|
||||
DISTUTILS_SINGLE_IMPL=1
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
|
||||
HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
|
||||
SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="libav"
|
||||
|
||||
RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
x11-libs/gtk+:3
|
||||
|| ( media-video/vlc media-video/mpv media-video/mplayer )
|
||||
!libav? ( media-video/ffmpeg )
|
||||
libav? ( media-video/libav )
|
||||
media-video/dvdauthor
|
||||
media-video/vcdimager
|
||||
virtual/cdrtools
|
||||
|| ( app-cdr/brasero app-cdr/k3b )"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}"
|
||||
@@ -1,4 +0,0 @@
|
||||
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
|
||||
@@ -1,230 +0,0 @@
|
||||
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 ();
|
||||
@@ -1,7 +0,0 @@
|
||||
<?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>
|
||||
@@ -1,57 +0,0 @@
|
||||
# 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