diff options
Diffstat (limited to 'net-misc')
37 files changed, 108 insertions, 2894 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex f4ac4816aae0..6824b21d54ae 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest index 5aced71d2b5e..809e6383c0bf 100644 --- a/net-misc/arpd/Manifest +++ b/net-misc/arpd/Manifest @@ -1,6 +1,6 @@ -AUX arpd-0.2-buildsystem-libevent-test.patch 446 BLAKE2B 110e37130b2977927689f115fc4d484d5f89438e1df54c6d43b889608495e3eab27e33e0eafe79857279c4365671b8d3e200e5fcb30bad0dc8d6c9d3987626d9 SHA512 391ad8f47d4f921d65eca692e70706c08804c1af65d779946bae8a520b6165921c0c3bd5e95a19ed078ffc7771f1b7247fce8d9e229834de2a0920853dbd0874 -AUX arpd-0.2-libevent.patch 506 BLAKE2B c02b7db79dc606e1946b09c24568d2a842d143f0febf216ee282f602ea4ae567c3818ae82b7c8e15b42780556d0accf9263d73d7c1776b3487ad543c50ab8123 SHA512 2b67af23366ed32a7354db84d372f1491571171b9b017d6c4eb3c52bc465fa9b5c1763327a5b99b69d89c46efab42590fcfc928442bd142485853cb0bbea7091 -AUX arpd.c.patch 1477 BLAKE2B e0ca4db2ed0fe688229f99844796b07eed0f0d0faed813d10143744a75d13cd93fa297e9ddd1573955485b4c90225b635950905d051a24ba198b765c14d61384 SHA512 04ef9a49ddeca1543a8098b499c26cfea4ba470d488a92d33ccaded9dcfe0a2e1f01de2596ae0fe1e220f73ceed54fbcea20024152ce886d65af560234bb21a4 +AUX arpd-0.2-buildsystem-libevent-test.patch 373 BLAKE2B acbb6c7865e032feb87451829322faf5061cbe3387ad15334f86031a4ff103766bb22c99547022f80c87f06ff53a6a95f3cceb2b4adb41d90b56b9c2e5ef6c50 SHA512 c990409996167538fd449bd70a102767f1db217f709b33cba4b7f27d8829d77246c354790820f0195ea0975ae730f4a6ac30e17e5bb7d22e1805f65ef247d14e +AUX arpd-0.2-libevent.patch 423 BLAKE2B 834691198e97f8018a0861ac2938b60840dacb5de3ac2ad5d1a632b94f1582a761e326ddca0bdd0cfc7f245a6c9cfe2ac5601382721c8471dd546b80ac1cec2d SHA512 2bcb236d138fff6433da7385a309e09eea583ee295ddacbadae7bd562b6df972ef0a45636b61dd72f62b375fa08382b9e82b62b220fa351b178b70571c1d86ae +AUX arpd.c.patch 1404 BLAKE2B 9dbae33986d92a0d220baf428cedc24bf1ffb3a3b41edeb8ebaad68d5c60752d1c16902a32ec314b59baf7b9bb5d9ece35b1adc0af5e67f6173bc47741e97eee SHA512 f9a5669525ed2081a47025206fed6b016ef4a7d35b10b2c8a7c7135b0b7eddf060e380a7561c59d23466065614c1d9287cffc3158cb05ad1907fc6ea569def28 DIST arpd-0.2.tar.gz 49437 BLAKE2B 6739954b5cb1da3d23251b526c5bc39b1563f6d54e74e5ff8d8e9c3f9b0ed1ecedc7caf805e51321849036d3dc49ab2e7f244599c7c2ef2b02d65160a8cf669c SHA512 24bd4626188d74e172a46312790f8453619af2ac634c23379d1922c789ed97ef5db8a73ae13fccd98c94457da79682d6a1d7ccc3236c787f9d2eb15f64716ea2 -EBUILD arpd-0.2-r1.ebuild 940 BLAKE2B 12af202a7bdc0910569d684cf05ecc9c382c84544efdf72ba4360959eeb62cce3e7e5cce7bbb0aa8d3b61f53b96da4cc517b4ff913a5f8d5f3337a7075d10512 SHA512 3d3315ad473ed88f20b788b290c2e04f142dc317489142db4cd35ad4b75efd034c6cc6617e234a97d09e1dfb86099a8313a329471efabe3f9440cc755891c327 +EBUILD arpd-0.2-r1.ebuild 966 BLAKE2B 820cd8579f7e9b0be6c7b7b3673bb02722c8337942924d5a4ba89cb9885e25acabb9ccb7b540242dc44c34babe61c84e399d26972704d5a78da270b9d5af2444 SHA512 8487cd545b486bb67ccd73795e09d17eec84d06ecbd3b02430c2ba704cbfbbad80f2a0817b2c756a7ac8a993a8ad35f88b0da304990a20083423e745a1be7aa2 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild index 788d227dc629..bd8fb5f5f32d 100644 --- a/net-misc/arpd/arpd-0.2-r1.ebuild +++ b/net-misc/arpd/arpd-0.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit autotools eutils +inherit autotools -DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)" +DESCRIPTION="ARP server claiming all unassigned addresses (for network monitoring/simulation)" HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/" SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz" @@ -14,28 +14,36 @@ SLOT="0" KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86" IUSE="" -DEPEND=">=dev-libs/libdnet-1.4 +DEPEND=" + >=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2" +RDEPEND="${DEPEND}" S=${WORKDIR}/${PN} -src_prepare() { - epatch "${FILESDIR}"/arpd.c.patch - epatch "${FILESDIR}"/${P}-libevent.patch +PATCHES=( + "${FILESDIR}"/arpd.c.patch + "${FILESDIR}"/${P}-libevent.patch - #fix bug 337481, replace test on libevent.a with libevent.so - epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch + # bug 337481, replace test on libevent.a with libevent.so + "${FILESDIR}"/${P}-buildsystem-libevent-test.patch +) +src_prepare() { + default + mv configure.{in,ac} || die eautoreconf } src_configure() { - econf --with-libdnet="${EPREFIX}"/usr --with-libevent="${EPREFIX}"/usr + econf \ + --with-libdnet="${EPREFIX}"/usr \ + --with-libevent="${EPREFIX}"/usr } src_install() { - dosbin arpd || die - doman arpd.8 || die + dosbin arpd + doman arpd.8 } diff --git a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch index c0c0f47712a8..598fd0b73777 100644 --- a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch +++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2003-02-09 19:30:33.000000000 +0100 -+++ configure.in 2010-09-17 00:33:36.138294836 +0200 +--- a/configure.in ++++ b/configure.in @@ -62,7 +62,7 @@ ;; *) diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch index 2d5998f8c8d3..367ae551ad98 100644 --- a/net-misc/arpd/files/arpd-0.2-libevent.patch +++ b/net-misc/arpd/files/arpd-0.2-libevent.patch @@ -1,5 +1,5 @@ ---- arpd.orig/arpd.c 2010-02-03 20:03:07.098748175 +0100 -+++ arpd/arpd.c 2010-02-03 20:06:24.469749941 +0100 +--- a/arpd.c ++++ b/arpd.c @@ -445,9 +445,6 @@ void terminate_handler(int sig) diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch index 732ed16c92d7..b8d2bbdb94b0 100644 --- a/net-misc/arpd/files/arpd.c.patch +++ b/net-misc/arpd/files/arpd.c.patch @@ -1,5 +1,5 @@ ---- arpd.c.orig 2005-03-30 15:13:37.136590624 -0700 -+++ arpd.c 2005-03-30 15:23:50.295231384 -0700 +--- a/arpd.c ++++ b/arpd.c @@ -265,7 +265,7 @@ spa->addr_ip, tha->addr_eth, tpa->addr_ip); diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index 878dbf541475..c5175fabb695 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -5,5 +5,5 @@ DIST linuxx86-13.7.0.10276925.tar.gz 21531393 BLAKE2B 31c132358c9ef7c8bc9b413084 DIST linuxx86-13.8.0.10299729.tar.gz 21763683 BLAKE2B fb8238dd256bbeff59df73e1ee495579ffa315d5d38d857436ebdafc2d5e4f9e3bf3c760a66005fbd82657ddbe418849a28532b15b757937d0892e4be33a1905 SHA512 7e6c70e3600cc56c85722f37e473cf3c422daded0f7e755c47bf8b17f224be0676f5ef09c594c058eae6760dc4633c13a02f4d75c3870a4a10a04d29159a670a EBUILD icaclient-13.7.0.10276925.ebuild 4635 BLAKE2B f51c1d52f61efbb39183272b2b6a38e5443793eafe1d55bc8b950364b3aa46b6a9e1b7a83a7a976db306e49756cf017a1bd135ae5ed8f28acb3bae2e34056995 SHA512 c3c89d17483a8ce1bad1c2513a6e2e3a2a96e3442d7e64a2d0b44e9f73c2077a417db453b97ba6bea5a610f0b41216552ee0f9f0671333f8c213976ce5857684 EBUILD icaclient-13.7.0.10276927.ebuild 4630 BLAKE2B c465ec17d70c4096c287b4d1c57a9f71e80fcf96867cfed4e09bf18a0fbc6ade4796db324f51c7e3648f6bc7edd58d52e2b0bffb7cd19cd628629dc894b37a97 SHA512 6350dbf895eec5808ffb9abd698f69aadbebea7577596b37815f778f641d9cbf12636bbb35d6a80c16c455e5d350041ef97cba4674868390a93baa7673804ea2 -EBUILD icaclient-13.8.0.10299729.ebuild 4320 BLAKE2B 0eeafa010a5978ae71b5db5219e35cc44a87c4aa42395fda7a9cdd3db142684d6bc2f8c3e6e73facbf0b0e04e03102378df2f7447d3ebd999d2a6e0bed1195b5 SHA512 ba3ae1816dc22d8b6fae74615c31bb75c1d61730121b4201ac047cc835b5f0adb02e9171535fb74e42a254b86aeea344919f0ef4a470fb7b35483b84547caa59 +EBUILD icaclient-13.8.0.10299729-r1.ebuild 4384 BLAKE2B 2786e60d199bfeb808ad0cb8a22a9bc10f3f0bfee8e6cb90b5c31dfcf35398ffa8100eacf58d8f362fdfae2c6022e82b01229a0c455c9a887bcbe6bc70f99054 SHA512 9b77775a4863922045990b8a90fa8b0b8e9b2e661aaad0deb0317ad7867963736de860fd54b04180c2b16a84b30714b9304bcfe97ec6b866ae4f22c991f01cd1 MISC metadata.xml 731 BLAKE2B 0591439b7ee7542c2e23cb0421d0e51141db3ae4405cd865a9d6ca58742c7438645d496a55428598be89c92f69fdec881d60674b52eaedca802894b490954dc3 SHA512 dab4b211f7d0b6e4c1b25ea2009de42a50d1ae69b05a5aeada2870282c2049e8212bf88a879a349b92a00669f8f3ab348e8513f12b5e8143b1258b58f0f610b0 diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild index 590f4019bb37..3f42a1f8f41a 100644 --- a/net-misc/icaclient/icaclient-13.8.0.10299729.ebuild +++ b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild @@ -82,6 +82,11 @@ src_unpack() { S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" } +src_prepare() { + default + rm lib/UIDialogLibWebKit.so || die +} + src_install() { local tmpl dest diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest deleted file mode 100644 index 31e18a485b6b..000000000000 --- a/net-misc/mediatomb/Manifest +++ /dev/null @@ -1,20 +0,0 @@ -AUX mediatomb-0.12.0.confd 805 BLAKE2B e8dbf2c3aa07efe6aa4818d2b10624dad1f83cdc62fea6f4f9c733cc388784a01388fdf13c6df8f9bc2996df7f86b22b3499707ac65aed706685463eb900c77c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c -AUX mediatomb-0.12.0.config 6180 BLAKE2B da9c04dacb3029f2ddaf44dc89659503f5d15c7d14d4a9811e9591c3ee258db212a083126c758b19cf037d3f6fa6c61d7c7a990ef63c7bae9fdcf287af3e1cb1 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 -AUX mediatomb-0.12.1-flac-metadata.patch 17889 BLAKE2B 3bf9f9ee26256ef0179ea64297e3af623a79fa9debe4f4a011a03ff174890f208dcb67a99e1ea8f150136a6f3d3b17f48e844126bba6242c40cbf95533a8ec15 SHA512 e72e162576beb5f19518088f797b49ea81df52d32da2709bfd9f8841a3625d91ee0c7365d418d7469cf1162ca7840e3862b45ba3eb959549ec0d84e6428bc759 -AUX mediatomb-0.12.1-inotify-hard-links.patch 1483 BLAKE2B d8a285e9236f00e59c42f109242685b0a9becebd67a92f468deca232e8db857e2c16abfd8ed9df2b39420714d042eb13e7eb3b4cb68e99efd0c1933783d4fbe7 SHA512 f9062fc0fa86045b325bbc38a9b31142c1d6e6227e2560f6429390917f675e5d9b3e4910b957b9bf3337b88f79cd2f66353fcd5460218a619303342670592206 -AUX mediatomb-0.12.1-libextractor.patch 21074 BLAKE2B ad9beef52ab65fa073502757ebed3eceda00f353f0f9c4f674f6660ee4bc48ba1e3c12e7d25e71c8320368c83374ecdf87bd4276e3811330d20eae989fed04eb SHA512 c71f872b98f8928baf5c53e5dad59efea622429f8b9e8b257afef53f263b7090fc986dc29e68a2d6164f60c1b74080804b4550b99f5613533001246a5336a77f -AUX mediatomb-0.12.1-libmp4v2.patch 5893 BLAKE2B 5cd7c4009e4f0af2d481571a313678263ed38b5cf89fe65c1b54c99c9948346b7d360a8a56cf5e95375e7083e80b4b4d2ea8ef772b53e5bfee70e55716937a50 SHA512 8e712c13de6e129a9a0b0805fc00c3af92bc3cedb583fa3e068c27d57ed52ad3b4c777bd92a6b073e2fee88376a28ce4d2467e97ab8ae2f9ea3ed7a64a0e45d3 -AUX mediatomb-0.12.1-mozjs187.patch 8019 BLAKE2B 7667e4abcccacac349253d515166fa7d3d895bec013266c4d854f46ff3aa87780b87b31a35fd0e22a22992859277b06bcf9859c45e6a3052a1179ed533359035 SHA512 dc647eb34e508ac3ccdfc578b30e181da5aad60677a912e7a02967226a22e9f61f3123d84422c9ccd27cbba451b928b939cab3550286342bb662a319b097c66b -AUX mediatomb-0.12.1-system-ar.patch 1008 BLAKE2B c152532f4386857007241d249e5f573139867a71afda8d3788bbc6795fc0f650d26c3bb1d7c775591a1d195df1081fb822e7bf9f1fa12b018d5586464f8df78d SHA512 7b07d96769b18f22b3d096ff949cd176fd5f1eb2305fc7dd0df7080326ba1c33ac17b18875453c24d585c4334834aac42d80faac511c11d08c9fc3185f4fc94d -AUX mediatomb-0.12.1-system-uuid.patch 954 BLAKE2B 5bde3da2b9efe1eac092924c463674e2fe793058ad4780a1457d01b2e22fa2e8eb713262a88ac88de8bac64fa6e1e44d6e3e200bc8b9b35601dd0daf5db6b0e2 SHA512 68ac4bca71ac5f2e52daffb58d54199ddc87a7cfd02b89e93bc0c1b4496b95f6c82c0d362d36f37d3a9076c3bfb5d018df809fb485ca687923e5e1b78e6bf4bf -AUX mediatomb-0.12.1-thumb-cache.patch 8347 BLAKE2B f62978c7873c30fbea37f5af7dac774bc5af2dae7457acfd818e15de99753e45b32ea3ff1ff6ef15d32988cbec0ff3314367abd747051364d12a7c9a5f856a38 SHA512 8c919394f414dd029980916b082aeb567bda096b0e965cc95cfebc25bc7834af199eca4a0f46fc1b27131a48db349a227092ea20c5c5e1b64fbe93e2c13f2e44 -AUX mediatomb-0.12.1-thumbnail-locking.patch 4992 BLAKE2B 4a77f3e4ec9c0accc04f76378c9d0def5b798aae1428628fbe8e5ef7c9fc2de78d4005dfbf20a053c8102baedb0c80db4a48f435b05d7ba62b2e1af6591ca2bc SHA512 ebe283cb5a56412b80d25a712323628bd40cf3cdde94420dd8e382f52280b8c06e0009ff6a6d0c8531e653cb37e58bbedbf6c61bbd7232d05695628718a55976 -AUX mediatomb-0.12.1-time-t.patch 2999 BLAKE2B 62d0b83be0bdd96987d817e65229efe2e913d4c195de645e4fb513a4bd56b0d666e0bc45904832092bc4b8b443bb9c83fc029164a91a4f2224b1724886fbf663 SHA512 db993ea515e334b85e79f70373ac367f4951fa71b0d648ed67b5e6b4e5a596603ae0352a28411edf730f9b6e7ffa83d9c2ba9f0b4dc7c0e291a17a79cfd50d94 -AUX mediatomb-0.12.1-youtube-dl.patch 4704 BLAKE2B 3312957927e4e267dc194ced40e582c3582c2881ecb2006769393f8ccd404f7bb9603f4e8f5e61bac0602571a349540c435e25885a32555d89fd1c66b626c618 SHA512 658e580499c17fb5a8f78c41095c38a94043c4e472b1996507b97229ab1fadd3c8044f9c3d27c8f210052e1c96b5ad88cf9e70daef9e98d2e740b9376eb7f102 -AUX mediatomb-0.12.1.initd 833 BLAKE2B 782572a46704a2bb84f15e6cce7dd7922529bbf6e7d6d8ddb24d73613c78bfb5e36f6c7cc6475b500ab7905df96d172f194e3a247ee89968e34aed2063dab046 SHA512 a7fd0f7dee5ec657ac139fcfa2d81eeb914e7107df73afa70aa31f40f8cd60faa469ab582aabc235f3b3cd77859ba524da0d79a913479a79dadc7c0f41c90c34 -DIST mediatomb-0.12.1.tar.gz 1240612 BLAKE2B ecf20fed1805b5b18005d1045624947380838774a40d3ed675dffd29fb72c222a4b245fcbc88f5e53c4a6a38cc4d495a400a1530acd03972d25c6394d07edde8 SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 -DIST mediatomb-0.12.2_pre20160522.tar.gz 2415058 BLAKE2B f8cc15bb8a2cbabbf9962ec9e3f1f527798c63c1722a383731200e9161fd474479160fcd86c2afb85ef6ff7a5f171a3c5883c19dc14cf1605885edf5fd0a5021 SHA512 b45c81f548013b8fc0de84e02e47c8acbf21c359a6c41a5f13addfdd9d084ee58b23b776da4dce4da1f924a80a02835c622245165da09107c0b89786e5a69804 -DIST mediatomb_0.12.1-5.debian.tar.gz 36001 BLAKE2B 18fb0c1e572749e71b0462b0e633b2a3bb86a98f294e29ceba7257fe77177257dd7994d3cee58d13b87ee643fd7e6c46868e3c3b90f5cd6d320962750c45b923 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 -EBUILD mediatomb-0.12.1-r8.ebuild 4323 BLAKE2B 1abee841952b3a37ae1490f22cd1e8d0eaa5c7b38c351c66271d18bf2fd4deed4df6b62993ba384988b953a067c004cdcc854dd39c084cf76350e8050ae205ea SHA512 553a9a3acdfdc32d807b3f081e6322d8156f95951e7e0926f18994410548c341a3343acdb54a6e883c3e65229868fb2427221ac0a531d31673022c5d9beb2bd6 -EBUILD mediatomb-0.12.2_pre20160522.ebuild 3247 BLAKE2B e12929b157207d432c47ae442f5086162980f430ac9b913566a1ab2f8ea3872e3cb08d687cdfa5730b11e1fb09969b7ef77f6cef56d8d38db15d872dcb4a1b38 SHA512 bca0467f059b565e4fda74395c186e2d7373fbbf3bad50d485e314c932ddf67e45e3aaf7b9e728a11dbe169df93f386b164a9441b4301a52a67ea3fb0f2d2c63 -MISC metadata.xml 1407 BLAKE2B 19ef4472e27c55888ce2e79830a13629a16cd5a630788841a7a9f0fab6a422e140e35d6e87500dc60901e996fcb6e824755311e85e75a75ea6a7ff64711210c6 SHA512 667d62c12d0e8d9726a16fe683ed55998541f40c00fe26a9d4a5aebd5b717274167b7f22517592802b30535d085cde79b76472976ee77560cce4ba5a7ff38541 diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.confd b/net-misc/mediatomb/files/mediatomb-0.12.0.confd deleted file mode 100644 index 7f5c00830251..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.0.confd +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb - -# See the mediatomb(1) manpage for more info. - -# MediaTomb Web UI port. -# NOTE: The minimum value allowed is 49152 -MEDIATOMB_PORT=49152 - -# Run MediaTomb as this user. -# NOTE: For security reasons do not run MediaTomb as root. -MEDIATOMB_USER="mediatomb" - -# Run MediaTomb as this group. -# NOTE: For security reasons do not run MediaTomb as root. -MEDIATOMB_GROUP="mediatomb" - -# Path to MediaTomb config file. -MEDIATOMB_CONFIG="/etc/mediatomb/config.xml" - -# Path to MediaTomb log file. -MEDIATOMB_LOGFILE="/var/log/mediatomb.log" - -# Path to MediaTomb pid file. -MEDIATOMB_PIDFILE="/var/run/mediatomb.pid" - -# Other options you want to pass to MediaTomb. -# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface. -MEDIATOMB_OPTIONS="" diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.config b/net-misc/mediatomb/files/mediatomb-0.12.0.config deleted file mode 100644 index 0cd03b15d8e8..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.0.config +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd"> - <server> - <ui enabled="yes" show-tooltips="yes"> - <accounts enabled="no" session-timeout="30"> - <account user="mediatomb" password="mediatomb"/> - </accounts> - </ui> - <name>MediaTomb</name> - <udn></udn> - <home>/var/lib/mediatomb</home> - <webroot>/usr/share/mediatomb/web</webroot> - <storage> - <sqlite3 enabled="yes"> - <database-file>mediatomb.db</database-file> - </sqlite3> - <mysql enabled="no"> - <host>host</host> - <database>database</database> - <username>username</username> - <password>password</password> - </mysql> - </storage> - <protocolInfo extend="yes"/> - <pc-directory upnp-hide="no"/> - <extended-runtime-options> - <ffmpegthumbnailer enabled="no"> - <thumbnail-size>160</thumbnail-size> - <seek-percentage>10</seek-percentage> - <filmstrip-overlay>no</filmstrip-overlay> - <workaround-bugs>no</workaround-bugs> - <image-quality>8</image-quality> - </ffmpegthumbnailer> - <mark-played-items enabled="no" suppress-cds-updates="yes"> - <string mode="prepend">*</string> - <mark> - <content>video</content> - </mark> - </mark-played-items> - <lastfm enabled="no"> - <username>username</username> - <password>password</password> - </lastfm> - </extended-runtime-options> - </server> - <import hidden-files="no"> - <scripting script-charset="UTF-8"> - <common-script>/usr/share/mediatomb/js/common.js</common-script> - <playlist-script>/usr/share/mediatomb/js/playlists.js</playlist-script> - <virtual-layout type="builtin"> - <import-script>/usr/share/mediatomb/js/import.js</import-script> - </virtual-layout> - </scripting> - <mappings> - <extension-mimetype ignore-unknown="no"> - <map from="mp3" to="audio/mpeg"/> - <map from="ogx" to="application/ogg"/> - <map from="ogv" to="video/ogg"/> - <map from="oga" to="audio/ogg"/> - <map from="ogg" to="audio/ogg"/> - <map from="ogm" to="video/ogg"/> - <map from="asf" to="video/x-ms-asf"/> - <map from="asx" to="video/x-ms-asf"/> - <map from="wma" to="audio/x-ms-wma"/> - <map from="wax" to="audio/x-ms-wax"/> - <map from="wmv" to="video/x-ms-wmv"/> - <map from="wvx" to="video/x-ms-wvx"/> - <map from="wm" to="video/x-ms-wm"/> - <map from="wmx" to="video/x-ms-wmx"/> - <map from="m3u" to="audio/x-mpegurl"/> - <map from="pls" to="audio/x-scpls"/> - <map from="flv" to="video/x-flv"/> - <map from="mkv" to="video/x-matroska"/> - <map from="mka" to="audio/x-matroska"/> - <map from="avi" to="video/divx"/> - <map from="m2ts" to="video/avc"/> - <map from="cr2" to="image/raw"/> - <map from="nef" to="image/raw"/> - </extension-mimetype> - <mimetype-upnpclass> - <map from="audio/*" to="object.item.audioItem.musicTrack"/> - <map from="video/*" to="object.item.videoItem"/> - <map from="image/*" to="object.item.imageItem"/> - </mimetype-upnpclass> - <mimetype-contenttype> - <treat mimetype="audio/mpeg" as="mp3"/> - <treat mimetype="application/ogg" as="ogg"/> - <treat mimetype="video/ogg" as="ogg"/> - <treat mimetype="audio/ogg" as="ogg"/> - <treat mimetype="audio/x-flac" as="flac"/> - <treat mimetype="image/jpeg" as="jpg"/> - <treat mimetype="audio/x-mpegurl" as="playlist"/> - <treat mimetype="audio/x-scpls" as="playlist"/> - <treat mimetype="audio/x-wav" as="pcm"/> - <treat mimetype="audio/L16" as="pcm"/> - <treat mimetype="video/x-msvideo" as="avi"/> - <treat mimetype="video/mp4" as="mp4"/> - <treat mimetype="audio/mp4" as="mp4"/> - <treat mimetype="video/divx" as="avi"/> - </mimetype-contenttype> - </mappings> - <online-content> - <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no"> - <favorites user="NationalGeographic"/> - <playlists user="PlayStation"/> - <uploads user="Google"/> - <standardfeed feed="most_viewed" time-range="today"/> - <standardfeed feed="recently_featured" time-range="today"/> - </YouTube> - </online-content> - </import> - <transcoding enabled="no"> - <mimetype-profile-mappings> - <transcode mimetype="audio/ogg" using="audio2pcm"/> - <transcode mimetype="audio/x-flac" using="audio2pcm"/> - <transcode mimetype="video/ogg" using="video2mpeg"/> - <transcode mimetype="video/x-flv" using="video2mpeg"/> - </mimetype-profile-mappings> - <profiles> - <profile name="audio2pcm" enabled="yes" type="external"> - <mimetype>audio/L16</mimetype> - <accept-url>no</accept-url> - <first-resource>yes</first-resource> - <hide-original-resource>yes</hide-original-resource> - <accept-ogg-theora>no</accept-ogg-theora> - <sample-frequency>44100</sample-frequency> - <audio-channels>2</audio-channels> - <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/> - <buffer size="1048576" chunk-size="131072" fill-size="262144"/> - </profile> - <profile name="video2mpeg" enabled="yes" type="external"> - <mimetype>video/mpeg</mimetype> - <accept-url>no</accept-url> - <first-resource>yes</first-resource> - <hide-original-resource>yes</hide-original-resource> - <accept-ogg-theora>yes</accept-ogg-theora> - <sample-frequency>48000</sample-frequency> - <audio-channels>2</audio-channels> - <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/> - <buffer size="10485760" chunk-size="262144" fill-size="524288"/> - </profile> - </profiles> - </transcoding> -</config> diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch deleted file mode 100644 index 0228dffd08d8..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-flac-metadata.patch +++ /dev/null @@ -1,446 +0,0 @@ -diff -urpN a/build/Makefile.am b/build/Makefile.am ---- a/build/Makefile.am 2010-03-22 21:39:46.000000000 +1100 -+++ b/build/Makefile.am 2013-12-16 10:16:32.426878578 +1100 -@@ -18,6 +18,7 @@ libmediatomb_a_CXXFLAGS = \ - $(ICONV_CXXFLAGS) \ - $(LIBMAGIC_CFLAGS) \ - $(ID3LIB_CFLAGS) \ -+ $(FLAC_CFLAGS) \ - $(LIBEXIF_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(PTHREAD_CFLAGS) \ -@@ -44,6 +45,7 @@ mediatomb_CXXFLAGS = -I$(top_srcdir)/src - $(ICONV_CXXFLAGS) \ - $(LIBMAGIC_CFLAGS) \ - $(ID3LIB_CFLAGS) \ -+ $(FLAC_CFLAGS) \ - $(LIBEXIF_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(PTHREAD_CFLAGS) \ -@@ -78,6 +80,7 @@ mediatomb_LDADD = \ - $(JS_LIBS) \ - $(LIBMAGIC_LIBS) \ - $(ID3LIB_LIBS) \ -+ $(FLAC_LIBS) \ - $(LIBEXIF_LIBS) \ - $(ZLIB_LIBS) \ - $(RT_LIBS) \ -diff -urpN a/build/libmediatomb_src b/build/libmediatomb_src ---- a/build/libmediatomb_src 2010-03-23 04:09:53.000000000 +1100 -+++ b/build/libmediatomb_src 2013-12-16 10:14:49.730356868 +1100 -@@ -98,6 +98,8 @@ libmediatomb_a_SOURCES = \ - ../src/metadata/libmp4v2_handler.h \ - ../src/metadata/taglib_handler.cc \ - ../src/metadata/taglib_handler.h \ -+../src/metadata/flac_handler.cc \ -+../src/metadata/flac_handler.h \ - ../src/mpegdemux/buffer.c \ - ../src/mpegdemux/buffer.h \ - ../src/mpegdemux/mpegdemux.c \ -diff -urpN a/configure.ac b/configure.ac ---- a/configure.ac 2010-04-08 08:38:51.000000000 +1000 -+++ b/configure.ac 2013-12-16 10:24:16.547793225 +1100 -@@ -1314,6 +1314,35 @@ LDFLAGS="$LDFLAGS_SAVE" - LIBS="$LIBS_SAVE" - CXXFLAGS="$CXXFLAGS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" -+ -+######### FLAC -+ -+FLAC_STATUS= -+ -+MT_OPTION([FLAC], [enable], -+ [FLAC metadata extraction with the help of FLAC],[],[]) -+ -+if test "x$FLAC_OPTION_ENABLED" = xyes; then -+ MT_CHECK_PACKAGE([FLAC], -+ [FLAC/metadata], -+ [FLAC], [main]) -+else -+ FLAC_STATUS=disabled -+fi -+ -+if test "x$FLAC_STATUS" != xyes; then -+ if (test "x$FLAC_OPTION_REQUESTED" = xyes) && -+ (test "x$FLAC_OPTION_ENABLED" = xyes); then -+ AC_MSG_ERROR([unable to configure FLAC support]) -+ fi -+else -+ CFLAGS="$CFLAGS $FLAC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $FLAC_CFLAGS" -+ LDFLAGS="$LDFLAGS $FLAC_LDFLAGS $FLAC_LIBS" -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+fi -+ - ######## curl - - CURL_PROG_FOUND=0 -@@ -1914,7 +1943,7 @@ if (test "x$SOPCAST_OPTION_ENABLED" = xy - AC_DEFINE([SOPCAST], [1], [Enable support for the SopCast service]) - fi - --AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary]) -+AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tFLAC:\t\t\t$FLAC_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary]) - - ############### - AC_CONFIG_FILES([ -@@ -1946,6 +1975,7 @@ echo "inotify : $INOTIFY_S - echo "libexif : $LIBEXIF_STATUS" - echo "id3lib : $ID3LIB_STATUS" - echo "taglib : $TAGLIB_STATUS" -+echo "FLAC : $FLAC_STATUS" - echo "libmp4v2 : $LIBMP4V2_STATUS" - echo "ffmpeg : $FFMPEG_STATUS" - echo "ffmpegthumbnailer : $FFMPEGTHUMBNAILER_STATUS" -diff -urpN a/src/cds_resource_manager.cc b/src/cds_resource_manager.cc ---- a/src/cds_resource_manager.cc 2010-03-26 01:58:11.000000000 +1100 -+++ b/src/cds_resource_manager.cc 2013-12-16 10:25:15.277987292 +1100 -@@ -372,6 +372,7 @@ void CdsResourceManager::addResources(Re - // only add upnp:AlbumArtURI if we have an AA, skip the resource - if ((i > 0) && ((item->getResource(i)->getHandlerType() == CH_ID3) || - (item->getResource(i)->getHandlerType() == CH_MP4) || -+ (item->getResource(i)->getHandlerType() == CH_FLAC) || - (item->getResource(i)->getHandlerType() == CH_EXTURL))) - { - String rct; -diff -urpN a/src/config_manager.cc b/src/config_manager.cc ---- a/src/config_manager.cc 2010-03-26 01:58:11.000000000 +1100 -+++ b/src/config_manager.cc 2013-12-16 10:26:57.220886235 +1100 -@@ -624,6 +624,10 @@ String ConfigManager::createDefaultConfi - _(CONTENT_TYPE_OGG))); - mtcontent->appendElementChild(treat_as(_("audio/x-flac"), - _(CONTENT_TYPE_FLAC))); -+ mtcontent->appendElementChild(treat_as(_("audio/x-ms-wma"), -+ _(CONTENT_TYPE_WMA))); -+ mtcontent->appendElementChild(treat_as(_("audio/x-wavpack"), -+ _(CONTENT_TYPE_WAVPACK))); - mtcontent->appendElementChild(treat_as(_("image/jpeg"), - _(CONTENT_TYPE_JPG))); - mtcontent->appendElementChild(treat_as(_("audio/x-mpegurl"), -diff -urpN a/src/metadata/flac_handler.cc b/src/metadata/flac_handler.cc ---- a/src/metadata/flac_handler.cc 1970-01-01 10:00:00.000000000 +1000 -+++ b/src/metadata/flac_handler.cc 2013-12-16 10:30:19.955604387 +1100 -@@ -0,0 +1,204 @@ -+/*MT* -+ -+ MediaTomb - http://www.mediatomb.cc/ -+ -+ flac_handler.cc - this file is part of MediaTomb. -+ -+ Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>, -+ Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc> -+ -+ Copyright (C) 2006-2009 Gena Batyan <bgeradz@mediatomb.cc>, -+ Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>, -+ Leonhard Wimmer <leo@mediatomb.cc> -+ -+ MediaTomb is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 -+ as published by the Free Software Foundation. -+ -+ MediaTomb is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ version 2 along with MediaTomb; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ # $Id$ -+*/ -+ -+/// \file flac_handler.cc -+/// \brief Implementeation of the FlacHandler class. -+ -+#ifdef HAVE_CONFIG_H -+ #include "autoconfig.h" -+#endif -+ -+#ifdef HAVE_FLAC -+ -+#include <FLAC/all.h> -+ -+#include "flac_handler.h" -+#include "string_converter.h" -+#include "config_manager.h" -+#include "common.h" -+#include "tools.h" -+#include "mem_io_handler.h" -+ -+#include "content_manager.h" -+ -+using namespace zmm; -+ -+FlacHandler::FlacHandler() : MetadataHandler() -+{ -+} -+ -+static void addField(metadata_fields_t field, const FLAC__StreamMetadata* tags, Ref<CdsItem> item) -+{ -+ String value; -+ int i; -+ -+ Ref<StringConverter> sc = StringConverter::i2i(); // sure is sure -+ -+ switch (field) -+ { -+ case M_TITLE: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "TITLE"); -+ break; -+ case M_ARTIST: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "ARTIST"); -+ break; -+ case M_ALBUM: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "ALBUM"); -+ break; -+ case M_DATE: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "DATE"); -+ break; -+ case M_GENRE: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "GENRE"); -+ break; -+ case M_DESCRIPTION: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "DESCRIPTION"); -+ break; -+ case M_TRACKNUMBER: -+ i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, "TRACKNUMBER"); -+ break; -+ default: -+ return; -+ } -+ -+ if( 0 <= i ) -+ value = strchr((const char *)tags->data.vorbis_comment.comments[i].entry, '=') + 1; -+ else -+ return; -+ -+ value = trim_string(value); -+ -+ if (string_ok(value)) -+ { -+ item->setMetadata(MT_KEYS[field].upnp, sc->convert(value)); -+ log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str()); -+ } -+} -+ -+void FlacHandler::fillMetadata(Ref<CdsItem> item) -+{ -+ FLAC__StreamMetadata* tags = NULL; -+ FLAC__StreamMetadata streaminfo; -+ Ref<StringConverter> sc = StringConverter::i2i(); // sure is sure -+ -+ if( !FLAC__metadata_get_tags(item->getLocation().c_str(), &tags) ) -+ return; -+ -+ if( FLAC__METADATA_TYPE_VORBIS_COMMENT == tags->type ) -+ { -+ for (int i = 0; i < M_MAX; i++) -+ addField((metadata_fields_t) i, tags, item); -+ } -+ -+ FLAC__metadata_object_delete(tags); -+ tags = NULL; -+ -+ if( !FLAC__metadata_get_streaminfo(item->getLocation().c_str(), &streaminfo) ) -+ return; -+ -+ if( FLAC__METADATA_TYPE_STREAMINFO == streaminfo.type ) -+ { -+ // note: UPnP requires bytes/second -+ item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_BITRATE), String::from((unsigned)((streaminfo.data.stream_info.bits_per_sample * streaminfo.data.stream_info.sample_rate) / 8))); -+ // note: UPnP requires HMS -+ item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_DURATION), secondsToHMS((unsigned)(streaminfo.data.stream_info.total_samples / streaminfo.data.stream_info.sample_rate))); -+ item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), String::from(streaminfo.data.stream_info.sample_rate)); -+ item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), String::from(streaminfo.data.stream_info.channels)); -+ } -+ -+ if( !FLAC__metadata_get_picture(item->getLocation().c_str(), -+ &tags, -+ FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER, -+ NULL, -+ NULL, -+ (unsigned)-1, -+ (unsigned)-1, -+ (unsigned)-1, -+ (unsigned)-1 ) ) -+ return; -+ -+ if( FLAC__METADATA_TYPE_PICTURE == tags->type ) -+ { -+ String art_mimetype = tags->data.picture.mime_type; -+ log_debug("Mime type : %s\n", sc->convert(art_mimetype).c_str()); -+ -+ // saw that simply "PNG" was used with some mp3's, so mimetype setting -+ // was probably invalid -+ if (!string_ok(art_mimetype) || (art_mimetype.index('/') == -1)) -+ { -+#ifdef HAVE_MAGIC -+ art_mimetype = ContentManager::getInstance()->getMimeTypeFromBuffer((void *)tags->data.picture.data, tags->data.picture.data_length); -+ if (!string_ok(art_mimetype)) -+#endif -+ art_mimetype = _(MIMETYPE_DEFAULT); -+ -+ log_debug("Mime type via magic: %s\n", sc->convert(art_mimetype).c_str()); -+ } -+ -+ // if we could not determine the mimetype, then there is no -+ // point to add the resource - it's probably garbage -+ if (art_mimetype != _(MIMETYPE_DEFAULT)) -+ { -+ Ref<CdsResource> resource(new CdsResource(CH_FLAC)); -+ resource->addAttribute(MetadataHandler::getResAttrName(R_PROTOCOLINFO), renderProtocolInfo(art_mimetype)); -+ resource->addParameter(_(RESOURCE_CONTENT_TYPE), _(ID3_ALBUM_ART)); -+ item->addResource(resource); -+ } -+ } -+ -+ FLAC__metadata_object_delete(tags); -+} -+ -+Ref<IOHandler> FlacHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size) -+{ -+ FLAC__StreamMetadata* picture = NULL; -+ -+ if( !FLAC__metadata_get_picture(item->getLocation().c_str(), -+ &picture, -+ FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER, -+ NULL, -+ NULL, -+ (unsigned)-1, -+ (unsigned)-1, -+ (unsigned)-1, -+ (unsigned)-1 ) ) -+ throw _Exception(_("FlacHandler: could not exctract cover from: ") + item->getLocation()); -+ -+ if( FLAC__METADATA_TYPE_PICTURE != picture->type ) -+ throw _Exception(_("TagHandler: resource has no album information")); -+ -+ Ref<IOHandler> h(new MemIOHandler((void *)picture->data.picture.data, picture->data.picture.data_length)); -+ *data_size = picture->data.picture.data_length; -+ -+ FLAC__metadata_object_delete(picture); -+ -+ return h; -+} -+ -+#endif // HAVE_FLAC -diff -urpN a/src/metadata/flac_handler.h b/src/metadata/flac_handler.h ---- a/src/metadata/flac_handler.h 1970-01-01 10:00:00.000000000 +1000 -+++ b/src/metadata/flac_handler.h 2013-12-16 10:31:24.061822827 +1100 -@@ -0,0 +1,47 @@ -+/*MT* -+ -+ MediaTomb - http://www.mediatomb.cc/ -+ -+ flac_handler.h - this file is part of MediaTomb. -+ -+ Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>, -+ Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc> -+ -+ Copyright (C) 2006-2009 Gena Batyan <bgeradz@mediatomb.cc>, -+ Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>, -+ Leonhard Wimmer <leo@mediatomb.cc> -+ -+ MediaTomb is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 -+ as published by the Free Software Foundation. -+ -+ MediaTomb is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ version 2 along with MediaTomb; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ # $Id$ -+*/ -+ -+/// \file flac_handler.h -+/// \brief Definition of the FlacHandler class. -+ -+#ifndef __METADATA_FLAC_H__ -+#define __METADATA_FLAC_H__ -+ -+#include "metadata_handler.h" -+ -+/// \brief This class is responsible for reading FLAC metadata -+class FlacHandler : public MetadataHandler -+{ -+public: -+ FlacHandler(); -+ virtual void fillMetadata(zmm::Ref<CdsItem> item); -+ virtual zmm::Ref<IOHandler> serveContent(zmm::Ref<CdsItem> item, int resNum, off_t *data_size); -+}; -+ -+#endif // __METADATA_FLAC_H__ -diff -urpN a/src/metadata_handler.cc b/src/metadata_handler.cc ---- a/src/metadata_handler.cc 2010-03-26 01:58:11.000000000 +1100 -+++ b/src/metadata_handler.cc 2013-12-16 10:35:48.783540865 +1100 -@@ -51,6 +51,10 @@ - #endif // HAVE_ID3LIB - #endif // HAVE_TAGLIB - -+#ifdef HAVE_FLAC -+#include "metadata/flac_handler.h" -+#endif -+ - #ifdef HAVE_LIBMP4V2 - #include "metadata/libmp4v2_handler.h" - #endif -@@ -140,7 +144,8 @@ void MetadataHandler::setMetadata(Ref<Cd - if ((content_type == CONTENT_TYPE_MP3) || - ((content_type == CONTENT_TYPE_OGG) && - (!item->getFlag(OBJECT_FLAG_OGG_THEORA))) || -- (content_type == CONTENT_TYPE_FLAC)) -+ (content_type == CONTENT_TYPE_WMA) || -+ (content_type == CONTENT_TYPE_WAVPACK)) - { - handler = Ref<MetadataHandler>(new TagHandler()); - break; -@@ -155,7 +160,13 @@ void MetadataHandler::setMetadata(Ref<Cd - #endif // HAVE_ID3LIB - #endif // HAVE_TAGLIB - -- -+#ifdef HAVE_FLAC -+ if (content_type == CONTENT_TYPE_FLAC) -+ { -+ handler = Ref<MetadataHandler>(new FlacHandler()); -+ break; -+ } -+#endif - - #ifdef HAVE_EXIV2 - /* -@@ -277,6 +288,10 @@ Ref<MetadataHandler> MetadataHandler::cr - case CH_FFTH: - return Ref<MetadataHandler>(new FfmpegHandler()); - #endif -+#ifdef HAVE_FLAC -+ case CH_FLAC: -+ return Ref<MetadataHandler>(new FlacHandler()); -+#endif - default: - throw _Exception(_("unknown content handler ID: ") + handlerType); - } -diff -urpN a/src/metadata_handler.h b/src/metadata_handler.h ---- a/src/metadata_handler.h 2010-03-26 01:58:11.000000000 +1100 -+++ b/src/metadata_handler.h 2013-12-16 10:52:23.234353526 +1100 -@@ -45,10 +45,13 @@ - #define CH_EXTURL 4 - #define CH_MP4 5 - #define CH_FFTH 6 -+#define CH_FLAC 7 - - #define CONTENT_TYPE_MP3 "mp3" - #define CONTENT_TYPE_OGG "ogg" - #define CONTENT_TYPE_FLAC "flac" -+#define CONTENT_TYPE_WMA "wma" -+#define CONTENT_TYPE_WAVPACK "wv" - #define CONTENT_TYPE_JPG "jpg" - #define CONTENT_TYPE_PLAYLIST "playlist" - #define CONTENT_TYPE_MP4 "mp4" diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch deleted file mode 100644 index af9a887befe0..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-inotify-hard-links.patch +++ /dev/null @@ -1,34 +0,0 @@ -make sure new hard links get processed like new files by handling -the IN_CREATE flag properly - -patch by Mike Frysinger - ---- a/src/autoscan_inotify.cc -+++ b/src/autoscan_inotify.cc -@@ -281,7 +284,7 @@ - } - } - -- if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT)) -+ if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT | IN_CREATE)) - { - String fullPath; - if (mask & IN_ISDIR) -@@ -289,7 +292,7 @@ - else - fullPath = path; - -- if (! (mask & IN_MOVED_TO)) -+ if (! (mask & (IN_MOVED_TO | IN_CREATE))) - { - log_debug("deleting %s\n", fullPath.c_str()); - -@@ -312,7 +315,7 @@ - if (objectID != INVALID_OBJECT_ID) - cm->removeObject(objectID); - } -- if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO)) -+ if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO | IN_CREATE)) - { - log_debug("adding %s\n", path.c_str()); - // path, recursive, async, hidden, low priority, cancellable diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch deleted file mode 100644 index e46aca9c487f..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-libextractor.patch +++ /dev/null @@ -1,675 +0,0 @@ -http://bugs.gentoo.org/435394 - -port to libextractor-0.6.x - -patch by Mike Frysinger <vapier@gentoo.org> - ---- a/configure.ac -+++ b/configure.ac -@@ -1631,7 +1631,7 @@ MT_CHECK_OPTIONAL_PACKAGE([lastfmlib], [disable], - ######## extractor - - if test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes; then -- MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_getKeywords]) -+ MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_extract]) - fi - - if test "x$LIBEXTRACTOR_STATUS" = xyes; then ---- a/src/metadata/extractor_handler.cc -+++ b/src/metadata/extractor_handler.cc -@@ -55,322 +55,344 @@ ExtractorHandler::ExtractorHandler() : MetadataHandler() - { - } - --static EXTRACTOR_KeywordType getTagFromString(String tag) -+static EXTRACTOR_MetaType getTagFromString(String tag) - { -- if (tag == "EXTRACTOR_UNKNOWN") -- return EXTRACTOR_UNKNOWN; -- if (tag == "EXTRACTOR_FILENAME") -- return EXTRACTOR_FILENAME; -- if (tag == "EXTRACTOR_MIMETYPE") -- return EXTRACTOR_MIMETYPE; -- if (tag == "EXTRACTOR_TITLE") -- return EXTRACTOR_TITLE; -- if (tag == "EXTRACTOR_AUTHOR") -- return EXTRACTOR_AUTHOR; -- if (tag == "EXTRACTOR_ARTIST") -- return EXTRACTOR_ARTIST; -- if (tag == "EXTRACTOR_DESCRIPTION") -- return EXTRACTOR_DESCRIPTION; -- if (tag == "EXTRACTOR_COMMENT") -- return EXTRACTOR_COMMENT; -- if (tag == "EXTRACTOR_DATE") -- return EXTRACTOR_DATE; -- if (tag == "EXTRACTOR_PUBLISHER") -- return EXTRACTOR_PUBLISHER; -- if (tag == "EXTRACTOR_LANGUAGE") -- return EXTRACTOR_LANGUAGE; -- if (tag == "EXTRACTOR_ALBUM") -- return EXTRACTOR_ALBUM; -- if (tag == "EXTRACTOR_GENRE") -- return EXTRACTOR_GENRE; -- if (tag == "EXTRACTOR_LOCATION") -- return EXTRACTOR_LOCATION; -- if (tag == "EXTRACTOR_VERSIONNUMBER") -- return EXTRACTOR_VERSIONNUMBER; -- if (tag == "EXTRACTOR_ORGANIZATION") -- return EXTRACTOR_ORGANIZATION; -- if (tag == "EXTRACTOR_COPYRIGHT") -- return EXTRACTOR_COPYRIGHT; -- if (tag == "EXTRACTOR_SUBJECT") -- return EXTRACTOR_SUBJECT; -- if (tag == "EXTRACTOR_KEYWORDS") -- return EXTRACTOR_KEYWORDS; -- if (tag == "EXTRACTOR_CONTRIBUTOR") -- return EXTRACTOR_CONTRIBUTOR; -- if (tag == "EXTRACTOR_RESOURCE_TYPE") -- return EXTRACTOR_RESOURCE_TYPE; -- if (tag == "EXTRACTOR_FORMAT") -- return EXTRACTOR_FORMAT; -- if (tag == "EXTRACTOR_RESOURCE_IDENTIFIER") -- return EXTRACTOR_RESOURCE_IDENTIFIER; -- if (tag == "EXTRACTOR_SOURCE") -- return EXTRACTOR_SOURCE; -- if (tag == "EXTRACTOR_RELATION") -- return EXTRACTOR_RELATION; -- if (tag == "EXTRACTOR_COVERAGE") -- return EXTRACTOR_COVERAGE; -- if (tag == "EXTRACTOR_SOFTWARE") -- return EXTRACTOR_SOFTWARE; -- if (tag == "EXTRACTOR_DISCLAIMER") -- return EXTRACTOR_DISCLAIMER; -- if (tag == "EXTRACTOR_WARNING") -- return EXTRACTOR_WARNING; -- if (tag == "EXTRACTOR_TRANSLATED") -- return EXTRACTOR_TRANSLATED; -- if (tag == "EXTRACTOR_CREATION_DATE") -- return EXTRACTOR_CREATION_DATE; -- if (tag == "EXTRACTOR_MODIFICATION_DATE") -- return EXTRACTOR_MODIFICATION_DATE; -- if (tag == "EXTRACTOR_CREATOR") -- return EXTRACTOR_CREATOR; -- if (tag == "EXTRACTOR_PRODUCER") -- return EXTRACTOR_PRODUCER; -- if (tag == "EXTRACTOR_PAGE_COUNT") -- return EXTRACTOR_PAGE_COUNT; -- if (tag == "EXTRACTOR_PAGE_ORIENTATION") -- return EXTRACTOR_PAGE_ORIENTATION; -- if (tag == "EXTRACTOR_PAPER_SIZE") -- return EXTRACTOR_PAPER_SIZE; -- if (tag == "EXTRACTOR_USED_FONTS") -- return EXTRACTOR_USED_FONTS; -- if (tag == "EXTRACTOR_PAGE_ORDER") -- return EXTRACTOR_PAGE_ORDER; -- if (tag == "EXTRACTOR_CREATED_FOR") -- return EXTRACTOR_CREATED_FOR; -- if (tag == "EXTRACTOR_MAGNIFICATION") -- return EXTRACTOR_MAGNIFICATION; -- if (tag == "EXTRACTOR_RELEASE") -- return EXTRACTOR_RELEASE; -- if (tag == "EXTRACTOR_GROUP") -- return EXTRACTOR_GROUP; -- if (tag == "EXTRACTOR_SIZE") -- return EXTRACTOR_SIZE; -- if (tag == "EXTRACTOR_SUMMARY") -- return EXTRACTOR_SUMMARY; -- if (tag == "EXTRACTOR_PACKAGER") -- return EXTRACTOR_PACKAGER; -- if (tag == "EXTRACTOR_VENDOR") -- return EXTRACTOR_VENDOR; -- if (tag == "EXTRACTOR_LICENSE") -- return EXTRACTOR_LICENSE; -- if (tag == "EXTRACTOR_DISTRIBUTION") -- return EXTRACTOR_DISTRIBUTION; -- if (tag == "EXTRACTOR_BUILDHOST") -- return EXTRACTOR_BUILDHOST; -- if (tag == "EXTRACTOR_OS") -- return EXTRACTOR_OS; -- if (tag == "EXTRACTOR_DEPENDENCY") -- return EXTRACTOR_DEPENDENCY; -- if (tag == "EXTRACTOR_HASH_MD4") -- return EXTRACTOR_HASH_MD4; -- if (tag == "EXTRACTOR_HASH_MD5") -- return EXTRACTOR_HASH_MD5; -- if (tag == "EXTRACTOR_HASH_SHA0") -- return EXTRACTOR_HASH_SHA0; -- if (tag == "EXTRACTOR_HASH_SHA1") -- return EXTRACTOR_HASH_SHA1; -- if (tag == "EXTRACTOR_HASH_RMD160") -- return EXTRACTOR_HASH_RMD160; -- if (tag == "EXTRACTOR_RESOLUTION") -- return EXTRACTOR_RESOLUTION; -- if (tag == "EXTRACTOR_CATEGORY") -- return EXTRACTOR_CATEGORY; -- if (tag == "EXTRACTOR_BOOKTITLE") -- return EXTRACTOR_BOOKTITLE; -- if (tag == "EXTRACTOR_PRIORITY") -- return EXTRACTOR_PRIORITY; -- if (tag == "EXTRACTOR_CONFLICTS") -- return EXTRACTOR_CONFLICTS; -- if (tag == "EXTRACTOR_REPLACES") -- return EXTRACTOR_REPLACES; -- if (tag == "EXTRACTOR_PROVIDES") -- return EXTRACTOR_PROVIDES; -- if (tag == "EXTRACTOR_CONDUCTOR") -- return EXTRACTOR_CONDUCTOR; -- if (tag == "EXTRACTOR_INTERPRET") -- return EXTRACTOR_INTERPRET; -- if (tag == "EXTRACTOR_OWNER") -- return EXTRACTOR_OWNER; -- if (tag == "EXTRACTOR_LYRICS") -- return EXTRACTOR_LYRICS; -- if (tag == "EXTRACTOR_MEDIA_TYPE") -- return EXTRACTOR_MEDIA_TYPE; -- if (tag == "EXTRACTOR_CONTACT") -- return EXTRACTOR_CONTACT; -- if (tag == "EXTRACTOR_THUMBNAIL_DATA") -- return EXTRACTOR_THUMBNAIL_DATA; -- --#ifdef EXTRACTOR_GE_0_5_2 -- if (tag == "EXTRACTOR_PUBLICATION_DATE") -- return EXTRACTOR_PUBLICATION_DATE; -- if (tag == "EXTRACTOR_CAMERA_MAKE") -- return EXTRACTOR_CAMERA_MAKE; -- if (tag == "EXTRACTOR_CAMERA_MODEL") -- return EXTRACTOR_CAMERA_MODEL; -- if (tag == "EXTRACTOR_EXPOSURE") -- return EXTRACTOR_EXPOSURE; -- if (tag == "EXTRACTOR_APERTURE") -- return EXTRACTOR_APERTURE; -- if (tag == "EXTRACTOR_EXPOSURE_BIAS") -- return EXTRACTOR_EXPOSURE_BIAS; -- if (tag == "EXTRACTOR_FLASH") -- return EXTRACTOR_FLASH; -- if (tag == "EXTRACTOR_FLASH_BIAS") -- return EXTRACTOR_FLASH_BIAS; -- if (tag == "EXTRACTOR_FOCAL_LENGTH") -- return EXTRACTOR_FOCAL_LENGTH; -- if (tag == "EXTRACTOR_FOCAL_LENGTH_35MM") -- return EXTRACTOR_FOCAL_LENGTH_35MM; -- if (tag == "EXTRACTOR_ISO_SPEED") -- return EXTRACTOR_ISO_SPEED; -- if (tag == "EXTRACTOR_EXPOSURE_MODE") -- return EXTRACTOR_EXPOSURE_MODE; -- if (tag == "EXTRACTOR_METERING_MODE") -- return EXTRACTOR_METERING_MODE; -- if (tag == "EXTRACTOR_MACRO_MODE") -- return EXTRACTOR_MACRO_MODE; -- if (tag == "EXTRACTOR_IMAGE_QUALITY") -- return EXTRACTOR_IMAGE_QUALITY; -- if (tag == "EXTRACTOR_WHITE_BALANCE") -- return EXTRACTOR_WHITE_BALANCE; -- if (tag == "EXTRACTOR_ORIENTATION") -- return EXTRACTOR_ORIENTATION; --#endif // EXTRACTOR_GE_0_5_2 -+#define T(x) [EXTRACTOR_METATYPE_##x] = "EXTRACTOR_METATYPE_"#x, -+ /* XXX: should convert to EXTRACTOR_metatype_to_string() somehow */ -+ const char *types[] = -+ { -+ T(RESERVED) -+ T(MIMETYPE) -+ T(FILENAME) -+ T(COMMENT) -+ -+ T(TITLE) -+ T(BOOK_TITLE) -+ T(BOOK_EDITION) -+ T(BOOK_CHAPTER_NUMBER) -+ T(JOURNAL_NAME) -+ T(JOURNAL_VOLUME) -+ T(JOURNAL_NUMBER) -+ T(PAGE_COUNT) -+ T(PAGE_RANGE) -+ T(AUTHOR_NAME) -+ T(AUTHOR_EMAIL) -+ T(AUTHOR_INSTITUTION) -+ T(PUBLISHER) -+ T(PUBLISHER_ADDRESS) -+ T(PUBLISHER_INSTITUTION) -+ T(PUBLISHER_SERIES) -+ T(PUBLICATION_TYPE) -+ T(PUBLICATION_YEAR) -+ T(PUBLICATION_MONTH) -+ T(PUBLICATION_DAY) -+ T(PUBLICATION_DATE) -+ T(BIBTEX_EPRINT) -+ T(BIBTEX_ENTRY_TYPE) -+ T(LANGUAGE) -+ T(CREATION_TIME) -+ T(URL) -+ -+ T(URI) -+ T(ISRC) -+ T(HASH_MD4) -+ T(HASH_MD5) -+ T(HASH_SHA0) -+ T(HASH_SHA1) -+ T(HASH_RMD160) -+ -+ T(GPS_LATITUDE_REF) -+ T(GPS_LATITUDE) -+ T(GPS_LONGITUDE_REF) -+ T(GPS_LONGITUDE) -+ T(LOCATION_CITY) -+ T(LOCATION_SUBLOCATION) -+ T(LOCATION_COUNTRY) -+ T(LOCATION_COUNTRY_CODE) -+ -+ T(UNKNOWN) -+ T(DESCRIPTION) -+ T(COPYRIGHT) -+ T(RIGHTS) -+ T(KEYWORDS) -+ T(ABSTRACT) -+ T(SUMMARY) -+ T(SUBJECT) -+ T(CREATOR) -+ T(FORMAT) -+ T(FORMAT_VERSION) -+ -+ T(CREATED_BY_SOFTWARE) -+ T(UNKNOWN_DATE) -+ T(CREATION_DATE) -+ T(MODIFICATION_DATE) -+ T(LAST_PRINTED) -+ T(LAST_SAVED_BY) -+ T(TOTAL_EDITING_TIME) -+ T(EDITING_CYCLES) -+ T(MODIFIED_BY_SOFTWARE) -+ T(REVISION_HISTORY) -+ -+ T(EMBEDDED_FILE_SIZE) -+ T(FINDER_FILE_TYPE) -+ T(FINDER_FILE_CREATOR) -+ -+ T(PACKAGE_NAME) -+ T(PACKAGE_VERSION) -+ T(SECTION) -+ T(UPLOAD_PRIORITY) -+ T(PACKAGE_DEPENDENCY) -+ T(PACKAGE_CONFLICTS) -+ T(PACKAGE_REPLACES) -+ T(PACKAGE_PROVIDES) -+ T(PACKAGE_RECOMMENDS) -+ T(PACKAGE_SUGGESTS) -+ T(PACKAGE_MAINTAINER) -+ T(PACKAGE_INSTALLED_SIZE) -+ T(PACKAGE_SOURCE) -+ T(PACKAGE_ESSENTIAL) -+ T(TARGET_ARCHITECTURE) -+ T(PACKAGE_PRE_DEPENDENCY) -+ T(LICENSE) -+ T(PACKAGE_DISTRIBUTION) -+ T(BUILDHOST) -+ T(VENDOR) -+ T(TARGET_OS) -+ T(SOFTWARE_VERSION) -+ T(TARGET_PLATFORM) -+ T(RESOURCE_TYPE) -+ T(LIBRARY_SEARCH_PATH) -+ T(LIBRARY_DEPENDENCY) -+ -+ T(CAMERA_MAKE) -+ T(CAMERA_MODEL) -+ T(EXPOSURE) -+ T(APERTURE) -+ T(EXPOSURE_BIAS) -+ T(FLASH) -+ T(FLASH_BIAS) -+ T(FOCAL_LENGTH) -+ T(FOCAL_LENGTH_35MM) -+ T(ISO_SPEED) -+ T(EXPOSURE_MODE) -+ T(METERING_MODE) -+ T(MACRO_MODE) -+ T(IMAGE_QUALITY) -+ T(WHITE_BALANCE) -+ T(ORIENTATION) -+ T(MAGNIFICATION) -+ -+ T(IMAGE_DIMENSIONS) -+ T(PRODUCED_BY_SOFTWARE) -+ T(THUMBNAIL) -+ T(IMAGE_RESOLUTION) -+ T(SOURCE) -+ -+ T(CHARACTER_SET) -+ T(LINE_COUNT) -+ T(PARAGRAPH_COUNT) -+ T(WORD_COUNT) -+ T(CHARACTER_COUNT) -+ T(PAGE_ORIENTATION) -+ T(PAPER_SIZE) -+ T(TEMPLATE) -+ T(COMPANY) -+ T(MANAGER) -+ T(REVISION_NUMBER) -+ -+ T(DURATION) -+ T(ALBUM) -+ T(ARTIST) -+ T(GENRE) -+ T(TRACK_NUMBER) -+ T(DISC_NUMBER) -+ T(PERFORMER) -+ T(CONTACT_INFORMATION) -+ T(SONG_VERSION) -+ T(PICTURE) -+ T(COVER_PICTURE) -+ T(CONTRIBUTOR_PICTURE) -+ T(EVENT_PICTURE) -+ T(LOGO) -+ T(BROADCAST_TELEVISION_SYSTEM) -+ T(SOURCE_DEVICE) -+ T(DISCLAIMER) -+ T(WARNING) -+ T(PAGE_ORDER) -+ T(WRITER) -+ T(PRODUCT_VERSION) -+ T(CONTRIBUTOR_NAME) -+ T(MOVIE_DIRECTOR) -+ T(NETWORK_NAME) -+ T(SHOW_NAME) -+ T(CHAPTER_NAME) -+ T(SONG_COUNT) -+ T(STARTING_SONG) -+ T(PLAY_COUNTER) -+ T(CONDUCTOR) -+ T(INTERPRETATION) -+ T(COMPOSER) -+ T(BEATS_PER_MINUTE) -+ T(ENCODED_BY) -+ T(ORIGINAL_TITLE) -+ T(ORIGINAL_ARTIST) -+ T(ORIGINAL_WRITER) -+ T(ORIGINAL_RELEASE_YEAR) -+ T(ORIGINAL_PERFORMER) -+ T(LYRICS) -+ T(POPULARITY_METER) -+ T(LICENSEE) -+ T(MUSICIAN_CREDITS_LIST) -+ T(MOOD) -+ T(SUBTITLE) -+ -+ T(GNUNET_DISPLAY_TYPE) -+ T(GNUNET_FULL_DATA) -+ T(RATING) -+ T(ORGANIZATION) -+ T(RIPPER) -+ T(PRODUCER) -+ T(GROUP) -+ T(GNUNET_ORIGINAL_FILENAME) -+ }; -+#undef T -+ size_t i; -+ -+ for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i) -+ if (!strcmp(types[i], tag.c_str())) -+ return (EXTRACTOR_MetaType) i; - - log_warning("Ignoring unknown libextractor tag: %s\n", tag.c_str()); -- return EXTRACTOR_UNKNOWN; -+ return EXTRACTOR_METATYPE_UNKNOWN; - } - --static void addMetaField(metadata_fields_t field, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc) -+struct field_state { -+ Ref<CdsItem> item; -+ Ref<StringConverter> sc; -+ Ref<Array<StringBase> > aux; -+}; -+ -+static int addField(void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type, -+ enum EXTRACTOR_MetaFormat format, const char *data_mime_type, -+ const char *data, size_t data_len) - { -- String value; -- const char *temp = NULL; -- -+ metadata_fields_t field = M_MAX; -+ resource_attributes_t attr = R_MAX; -+ -+ if (!data) -+ return 0; -+ -+ log_debug("metadata %zu [%s] -> %s\n", (size_t)type, EXTRACTOR_metatype_to_string(type), data); -+ - /// \todo check if UTF-8 conversion is needed, may already be in UTF-8 -- -- switch (field) -+ -+ switch (type) - { -- case M_TITLE: -- temp = EXTRACTOR_extractLast(EXTRACTOR_TITLE, keywords); -+ case EXTRACTOR_METATYPE_TITLE: -+ field = M_TITLE; - break; -- case M_ARTIST: -- temp = EXTRACTOR_extractLast(EXTRACTOR_ARTIST, keywords); -+ case EXTRACTOR_METATYPE_ARTIST: -+ field = M_ARTIST; - break; -- case M_ALBUM: -- temp = EXTRACTOR_extractLast(EXTRACTOR_ALBUM, keywords); -+ case EXTRACTOR_METATYPE_ALBUM: -+ field = M_ALBUM; - break; -- case M_DATE: -- temp = EXTRACTOR_extractLast(EXTRACTOR_DATE, keywords); -+ case EXTRACTOR_METATYPE_PUBLICATION_YEAR: -+ field = M_DATE; - break; -- case M_GENRE: -- temp = EXTRACTOR_extractLast(EXTRACTOR_GENRE, keywords); -+ case EXTRACTOR_METATYPE_GENRE: -+ field = M_GENRE; - break; -- case M_DESCRIPTION: -- temp = EXTRACTOR_extractLast(EXTRACTOR_DESCRIPTION, keywords); -- -- if (temp == NULL) -- temp = EXTRACTOR_extractLast(EXTRACTOR_COMMENT, keywords); -+ case EXTRACTOR_METATYPE_DESCRIPTION: -+ field = M_DESCRIPTION; -+ break; -+ case EXTRACTOR_METATYPE_COMMENT: -+ field = M_DESCRIPTION; -+ break; -+ case EXTRACTOR_METATYPE_IMAGE_DIMENSIONS: -+ attr = R_RESOLUTION; - break; -- default: -- return; - } - -- if (temp != NULL) -- value = temp; -+ String value; -+ struct field_state *field_state = (struct field_state *)cls; -+ Ref<CdsItem> item = field_state->item; -+ Ref<StringConverter> sc = field_state->sc; -+ Ref<Array<StringBase> > aux = field_state->aux; -+ -+ if (field == M_MAX && attr == R_MAX && aux == nil) -+ { -+ log_debug("no match\n"); -+ return 0; -+ } - -+ value = data; - value = trim_string(value); -- -- if (string_ok(value)) -+ if (!string_ok(value)) -+ return 0; -+ -+ if (field != M_MAX) - { - item->setMetadata(MT_KEYS[field].upnp, sc->convert(value)); --// log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str()); -+ log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str()); - } --} - --static void addResourceField(resource_attributes_t attr, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc) --{ -- String value; -- const char *temp = NULL; -- -- switch (attr) -+ if (attr != R_MAX) - { -- case R_RESOLUTION: -- temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords); -- break; --/* case R_SIZE: -- temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords); -- break; --*/ -- default: -- return; -+ item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value); -+ log_debug("Setting attribute on item: %d, %s\n", attr, value.c_str()); - } - -- if (temp != NULL) -- value = temp; -- -- if (string_ok(value)) -+ if (aux != nil) - { -- item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value); -+ String tmp; -+ for (int j = 0; j < aux->size(); j++) -+ { -+ tmp = aux->get(j); -+ if (string_ok(tmp)) -+ { -+ if (type == getTagFromString(tmp)) -+ { -+ value = sc->convert(value); -+ item->setAuxData(tmp, value); -+ log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str())); -+ } -+ } -+ } - } -+ -+ return 0; - } - - - --Ref<RExp> ReAudioFormat; --EXTRACTOR_ExtractorList *extractors = NULL; --bool load_libraries_failed = false; -+static Ref<RExp> ReAudioFormat; -+static EXTRACTOR_PluginList *plugins = NULL; -+static bool load_libraries_failed = false; - - void ExtractorHandler::fillMetadata(Ref<CdsItem> item) - { - if (load_libraries_failed) - return; -- Ref<Array<StringBase> > aux; -- Ref<StringConverter> sc = StringConverter::i2i(); -- -- if (! extractors) -+ if (! plugins) - { -- extractors = EXTRACTOR_loadDefaultLibraries(); -- if (! extractors) -+ plugins = EXTRACTOR_plugin_add_defaults(EXTRACTOR_OPTION_DEFAULT_POLICY); -+ if (! plugins) -+ { - load_libraries_failed = true; -+ return; -+ } - } -- EXTRACTOR_KeywordList *keywords = EXTRACTOR_getKeywords(extractors, item->getLocation().c_str()); -- -- //EXTRACTOR_printKeywords(stdout, keywords); - -- for (int i = 0; i < M_MAX; i++) -- addMetaField((metadata_fields_t)i, keywords, item, sc); -- -- for (int i = 0; i < R_MAX; i++) -- addResourceField((resource_attributes_t)i, keywords, item, sc); -+ log_debug("processing %s\n", item->getLocation().c_str()); - - Ref<ConfigManager> cm = ConfigManager::getInstance(); -- aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST); -- if (aux != nil) -- { -- String value; -- String tmp; -- const char *temp = NULL; -- -- for (int j = 0; j < aux->size(); j++) -- { -- -- tmp = aux->get(j); -- if (string_ok(tmp)) -- { -- temp = EXTRACTOR_extractLast(getTagFromString(tmp), keywords); -- if (temp != NULL) -- { -- value = temp; -- if (string_ok(value)) -- { -- value = sc->convert(value); -- item->setAuxData(tmp, value); --// log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str())); -- } -- } -- } -- } -- } -+ struct field_state field_state = { -+ .item = item, -+ .sc = StringConverter::i2i(), -+ .aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST), -+ }; -+ EXTRACTOR_extract(plugins, item->getLocation().c_str(), NULL, 0, addField, &field_state); - - if (ReAudioFormat == nil) - { -@@ -379,35 +401,9 @@ void ExtractorHandler::fillMetadata(Ref<CdsItem> item) - ReAudioFormat->compile(_("([0-9]+)\\s+kbps,\\s*([0-9]+)\\s+hz,\\s*" - "(([0-9]+)h)?([0-9]+)m([0-9]+)\\s(\\S+)"), "i"); - } -- -- /* -- temp = EXTRACTOR_extractLast(EXTRACTOR_FORMAT, keywords); -- log_debug("EXTRACTOR_FORMAT: %s\n", temp); -- -- if (temp) -- { -- Ref<Matcher> matcher = ReAudioFormat->match((char *)temp); -- if (matcher != nil) -- { -- log_debug(("BR:%s FR:%s H:%s M:%s S:%s TYPE:%s\n", -- matcher->group(1).c_str(), -- matcher->group(2).c_str(), -- matcher->group(4).c_str(), -- matcher->group(5).c_str(), -- matcher->group(6).c_str(), -- matcher->group(7).c_str())); -- } -- else -- { -- log_debug(("format pattern unmatched!")); -- } -- } -- -- */ -- EXTRACTOR_freeKeywords(keywords); - - // commented out for the sake of efficiency -- // EXTRACTOR_removeAll(extractors); -+ // EXTRACTOR_plugin_remove_all(plugins); - } - - Ref<IOHandler> ExtractorHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size) diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch deleted file mode 100644 index 6a6b51e1e05a..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-libmp4v2.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff -urN old/src/metadata/libmp4v2_handler.cc new/src/metadata/libmp4v2_handler.cc ---- old/src/metadata/libmp4v2_handler.cc 2012-04-05 01:46:26.000000000 +0200 -+++ new/src/metadata/libmp4v2_handler.cc 2012-04-05 02:01:24.000000000 +0200 -@@ -65,29 +65,28 @@ - static void addMetaField(metadata_fields_t field, MP4FileHandle mp4, Ref<CdsItem> item) - { - String value; -- char* mp4_retval = NULL; -- u_int16_t track; -- u_int16_t total_tracks; -- - Ref<StringConverter> sc = StringConverter::i2i(); - -+ const MP4Tags* new_tags = MP4TagsAlloc(); -+ -+ if (!MP4TagsFetch(new_tags, mp4)) -+ return; -+ - switch (field) - { - case M_TITLE: -- MP4GetMetadataName(mp4, &mp4_retval); -+ value = new_tags->name; - break; - case M_ARTIST: -- MP4GetMetadataArtist(mp4, &mp4_retval); -+ value = new_tags->artist; - break; - case M_ALBUM: -- MP4GetMetadataAlbum(mp4, &mp4_retval); -+ value = new_tags->album; - break; - case M_DATE: -- MP4GetMetadataYear(mp4, &mp4_retval); -- if (mp4_retval) -+ value = new_tags->releaseDate; -+ if (value.length() > 0) - { -- value = mp4_retval; -- free(mp4_retval); - if (string_ok(value)) - value = value + "-01-01"; - else -@@ -95,34 +94,31 @@ - } - break; - case M_GENRE: -- MP4GetMetadataGenre(mp4, &mp4_retval); -+ value = new_tags->genre; - break; - case M_DESCRIPTION: -- MP4GetMetadataComment(mp4, &mp4_retval); -+ value = new_tags->comments; - break; - case M_TRACKNUMBER: -- MP4GetMetadataTrack(mp4, &track, &total_tracks); -- if (track > 0) -+ if (new_tags->track) - { -- value = String::from(track); -- item->setTrackNumber((int)track); -+ value = String::from(new_tags->track->index); -+ item->setTrackNumber((int)new_tags->track->index); - } - else -+ { -+ MP4TagsFree( new_tags ); - return; -+ } - break; - default: -+ MP4TagsFree( new_tags ); - return; - } - -- if ((field != M_DATE) && (field != M_TRACKNUMBER) && -- (mp4_retval)) -- { -- value = mp4_retval; -- free(mp4_retval); -- } -- -+ MP4TagsFree( new_tags ); - value = trim_string(value); -- -+ - if (string_ok(value)) - { - item->setMetadata(MT_KEYS[field].upnp, sc->convert(value)); -@@ -190,14 +186,19 @@ - } - - #if defined(HAVE_MAGIC) -- u_int8_t *art_data; -- u_int32_t art_data_len; -+ void *art_data = 0; -+ u_int32_t art_data_len = 0; - String art_mimetype; -+ -+ const MP4Tags* new_tags = MP4TagsAlloc(); -+ MP4TagsFetch(new_tags, mp4); -+ if (new_tags->artworkCount) -+ { -+ art_data = new_tags->artwork->data; -+ art_data_len = new_tags->artwork->size; -+ } - #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT -- if (MP4GetMetadataCoverArtCount(mp4) && -- MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len)) --#else -- MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len); -+ if (new_tags->artworkCount && art_data_len > 0) - #endif - { - if (art_data) -@@ -211,11 +212,10 @@ - } - catch (Exception ex) - { -- free(art_data); -+ MP4TagsFree(new_tags); - throw ex; - } - -- free(art_data); - if (art_mimetype != _(MIMETYPE_DEFAULT)) - { - Ref<CdsResource> resource(new CdsResource(CH_MP4)); -@@ -225,6 +225,7 @@ - } - } - } -+ MP4TagsFree(new_tags); - #endif - MP4Close(mp4); - } -@@ -249,26 +250,35 @@ - - if (ctype != ID3_ALBUM_ART) - throw _Exception(_("LibMP4V2Handler: got unknown content type: ") + ctype); -+ -+ const MP4Tags* new_tags = MP4TagsAlloc(); -+ if (MP4TagsFetch(new_tags, mp4)) -+ { - #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT -- if (!MP4GetMetadataCoverArtCount(mp4)) -- throw _Exception(_("LibMP4V2Handler: resource has no album art information")); -+ if (!new_tags->artworkCount) -+ throw _Exception(_("LibMP4V2Handler: resource has no album art information")); - #endif -- u_int8_t *art_data; -- u_int32_t art_data_len; -- if (MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len)) -- { -- if (art_data) -+ void *art_data = 0; -+ u_int32_t art_data_len; -+ -+ const MP4TagArtwork* art = new_tags->artwork; -+ art_data = art->data; -+ art_data_len = art->size; -+ if (art) - { -- *data_size = (off_t)art_data_len; -- Ref<IOHandler> h(new MemIOHandler((void *)art_data, art_data_len)); -- free(art_data); -- return h; -+ if (art_data) -+ { -+ *data_size = (off_t)art_data_len; -+ Ref<IOHandler> h(new MemIOHandler(art_data, art_data_len)); -+ MP4TagsFree(new_tags); -+ return h; -+ } - } -+ MP4TagsFree(new_tags); - } -- - throw _Exception(_("LibMP4V2Handler: could not serve album art " -- "for file") + item->getLocation() + -- " - embedded image not found"); -+ "for file") + item->getLocation() + -+ " - embedded image not found"); - } - - #endif // HAVE_LIBMP4V2 -De binära filerna old/src/metadata/.libmp4v2_handler.cc.swp och new/src/metadata/.libmp4v2_handler.cc.swp skiljer diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch deleted file mode 100644 index c4b080a3656b..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch +++ /dev/null @@ -1,260 +0,0 @@ -maybe this is correct, maybe it's not. spidermonkey's documentation blows, so -who is to say! - -https://bugs.gentoo.org/423991 - ---- a/src/scripting/dvd_image_import_script.cc -+++ b/src/scripting/dvd_image_import_script.cc -@@ -232,8 +232,6 @@ DVDImportScript::DVDImportScript(Ref<Runtime> runtime) : Script(runtime) - - String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_DVD_SCRIPT); - load(scriptPath); -- root = JS_NewScriptObject(cx, script); -- JS_AddNamedRoot(cx, &root, "DVDImportScript"); - log_info("Loaded %s\n", scriptPath.c_str()); - - Ref<Dictionary> mappings = -@@ -296,21 +294,4 @@ void DVDImportScript::processDVDObject(Ref<CdsObject> obj) - #endif - } - --DVDImportScript::~DVDImportScript() --{ --#ifdef JS_THREADSAFE -- JS_SetContextThread(cx); -- JS_BeginRequest(cx); --#endif -- -- if (root) -- JS_RemoveRoot(cx, &root); -- --#ifdef JS_THREADSAFE -- JS_EndRequest(cx); -- JS_ClearContextThread(cx); --#endif -- --} -- - #endif // HAVE_JS ---- a/src/scripting/dvd_image_import_script.h -+++ b/src/scripting/dvd_image_import_script.h -@@ -41,7 +41,6 @@ class DVDImportScript : public Script - { - public: - DVDImportScript(zmm::Ref<Runtime> runtime); -- ~DVDImportScript(); - /// \brief Adds a DVD object to the database - /// - /// \param title DVD title number ---- a/src/scripting/import_script.cc -+++ b/src/scripting/import_script.cc -@@ -53,8 +53,6 @@ ImportScript::ImportScript(Ref<Runtime> runtime) : Script(runtime) - try - { - load(scriptPath); -- root = JS_NewObject(cx, NULL, script, NULL); -- JS_AddNamedObjectRoot(cx, &root, "ImportScript"); - } - catch (Exception ex) - { -@@ -109,21 +107,4 @@ void ImportScript::processCdsObject(Ref<CdsObject> obj, String rootpath) - #endif - } - --ImportScript::~ImportScript() --{ --#ifdef JS_THREADSAFE -- JS_SetContextThread(cx); -- JS_BeginRequest(cx); --#endif -- -- if (root) -- JS_RemoveObjectRoot(cx, &root); -- --#ifdef JS_THREADSAFE -- JS_EndRequest(cx); -- JS_ClearContextThread(cx); --#endif -- --} -- - #endif // HAVE_JS ---- a/src/scripting/import_script.h -+++ b/src/scripting/import_script.h -@@ -41,11 +41,8 @@ class ImportScript : public Script - { - public: - ImportScript(zmm::Ref<Runtime> runtime); -- ~ImportScript(); - void processCdsObject(zmm::Ref<CdsObject> obj, zmm::String rootpath); - virtual script_class_t whoami() { return S_IMPORT; } --private: -- JSObject *root; - }; - - #endif // __SCRIPTING_IMPORT_SCRIPT_H__ ---- a/src/scripting/playlist_parser_script.cc -+++ b/src/scripting/playlist_parser_script.cc -@@ -93,8 +93,6 @@ PlaylistParserScript::PlaylistParserScript(Ref<Runtime> runtime) : Script(runtim - - String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); - load(scriptPath); -- root = JS_NewObject(cx, NULL, script, NULL); -- JS_AddNamedObjectRoot(cx, &root, "PlaylistScript"); - } - catch (Exception ex) - { -@@ -236,21 +234,4 @@ void PlaylistParserScript::processPlaylistObject(zmm::Ref<CdsObject> obj, Ref<Ge - - } - -- --PlaylistParserScript::~PlaylistParserScript() --{ --#ifdef JS_THREADSAFE -- JS_SetContextThread(cx); -- JS_BeginRequest(cx); --#endif -- -- if (root) -- JS_RemoveObjectRoot(cx, &root); -- --#ifdef JS_THREADSAFE -- JS_EndRequest(cx); -- JS_ClearContextThread(cx); --#endif -- --} - #endif // HAVE_JS ---- a/src/scripting/playlist_parser_script.h -+++ b/src/scripting/playlist_parser_script.h -@@ -42,7 +42,6 @@ class PlaylistParserScript : public Script - { - public: - PlaylistParserScript(zmm::Ref<Runtime> runtime); -- ~PlaylistParserScript(); - zmm::String readln(); - void processPlaylistObject(zmm::Ref<CdsObject> obj, zmm::Ref<GenericTask> task); - virtual script_class_t whoami() { return S_PLAYLIST; } -@@ -52,7 +51,6 @@ private: - int currentObjectID; - char *currentLine; - zmm::Ref<GenericTask> currentTask; -- JSObject *root; - }; - - #endif // __SCRIPTING_PLAYLIST_PARSER_SCRIPT_H__ ---- a/src/scripting/script.cc -+++ b/src/scripting/script.cc -@@ -427,15 +427,10 @@ static JSFunctionSpec js_global_functions[] = { - try - { - common_script = _load(common_scr_path); -- common_root = JS_NewObject(cx, NULL, common_script, NULL); -- JS_AddNamedObjectRoot(cx, &common_root, "common-script"); - _execute(common_script); - } - catch (Exception e) - { -- if (common_root) -- JS_RemoveObjectRoot(cx, &common_root); -- - log_js("Unable to load %s: %s\n", common_scr_path.c_str(), - e.getMessage().c_str()); - } -@@ -459,8 +454,6 @@ Script::~Script() - JS_SetContextThread(cx); - JS_BeginRequest(cx); - #endif -- if (common_root) -- JS_RemoveObjectRoot(cx, &common_root); - - /* - * scripts are unrooted and will be cleaned up by GC -@@ -532,12 +532,12 @@ void Script::defineFunctions(JSFunctionSpec *functions) - throw _Exception(_("Scripting: JS_DefineFunctions failed")); - } - --JSObject *Script::_load(zmm::String scriptPath) -+JSScript *Script::_load(zmm::String scriptPath) - { - if (glob == NULL) - initGlobalObject(); - -- JSObject *scr; -+ JSScript *scr; - - String scriptText = read_text_file(scriptPath); - -@@ -568,7 +568,7 @@ void Script::load(zmm::String scriptPath) - } - - --void Script::_execute(JSObject *scr) -+void Script::_execute(JSScript *scr) - { - jsval ret_val; - ---- a/src/scripting/script.h -+++ b/src/scripting/script.h -@@ -66,8 +66,8 @@ public: - JSRuntime *rt; - JSContext *cx; - JSObject *glob; -- JSObject *script; -- JSObject *common_script; -+ JSScript *script; -+ JSScript *common_script; - - public: - Script(zmm::Ref<Runtime> runtime); -@@ -112,11 +112,9 @@ protected: - zmm::Ref<CdsObject> processed; - - private: -- JSObject *common_root; -- - void initGlobalObject(); -- JSObject *_load(zmm::String scriptPath); -- void _execute(JSObject *scr); -+ JSScript *_load(zmm::String scriptPath); -+ void _execute(JSScript *scr); - zmm::Ref<StringConverter> _p2i; - zmm::Ref<StringConverter> _j2i; - zmm::Ref<StringConverter> _f2i; ---- a/configure.ac -+++ b/configure.ac -@@ -1036,13 +1036,13 @@ - ], - [ - unset ac_cv_lib_smjs_JS_NewObject -- AC_CHECK_LIB(mozjs185, JS_NewObject, -+ AC_CHECK_LIB(mozjs187, JS_NewObject, - [ -- MOZLIB=mozjs185 -- JS_LIBS="-lmozjs185" -+ MOZLIB=mozjs187 -+ JS_LIBS="-lmozjs187" - ], - [ -- unset ac_cv_lib_mozjs185_JS_NewObject -+ unset ac_cv_lib_mozjs187_JS_NewObject - AC_CHECK_LIB(mozjs, JS_NewObject, - [ - MOZLIB=mozjs -@@ -1064,11 +1064,11 @@ - MOZLIB=smjs - ], - [ -- unset ac_cv_lib_mozjs185_JS_NewObject -- AC_CHECK_LIB(mozjs185, JS_NewObject, -+ unset ac_cv_lib_mozjs187_JS_NewObject -+ AC_CHECK_LIB(mozjs187, JS_NewObject, - [ -- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185" -- MOZLIB=mozjs185 -+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs187" -+ MOZLIB=mozjs187 - ], - [ - LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs" diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch deleted file mode 100644 index 349bf7d8da74..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-system-ar.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.ac 2010-04-08 00:38:51.000000000 +0200 -+++ configure.ac 2013-05-30 12:27:55.620514386 +0200 -@@ -318,6 +318,10 @@ - AC_PROG_CC - AC_PROG_RANLIB - AC_PROG_GCC_TRADITIONAL -+AN_MAKEVAR([AR], [AC_PROG_AR]) -+AN_PROGRAM([ar], [AC_PROG_AR]) -+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) -+AC_PROG_AR - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_HEADER_SYS_WAIT ---- build/Makefile.in 2010-04-08 00:40:15.000000000 +0200 -+++ build/Makefile.in 2013-05-30 12:25:55.310337928 +0200 -@@ -50,7 +50,7 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LIBRARIES = $(noinst_LIBRARIES) --AR = ar -+AR = @AR@ - ARFLAGS = cru - libmediatomb_a_AR = $(AR) $(ARFLAGS) - libmediatomb_a_LIBADD = ---- tombupnp/build/Makefile.in 2010-04-08 00:40:16.000000000 +0200 -+++ tombupnp/build/Makefile.in 2013-05-30 12:26:18.420371823 +0200 -@@ -48,7 +48,7 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LIBRARIES = $(noinst_LIBRARIES) --AR = ar -+AR = @AR@ - ARFLAGS = cru - libtombupnp_a_AR = $(AR) $(ARFLAGS) - libtombupnp_a_LIBADD = diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch deleted file mode 100644 index 053f18cea879..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch +++ /dev/null @@ -1,36 +0,0 @@ -use libuuid from the system rather than local bundled code - -http://bugs.gentoo.org/270830 - ---- a/build/Makefile.am -+++ b/build/Makefile.am -@@ -58,6 +58,7 @@ mediatomb_CXXFLAGS = -I$(top_srcdir)/src \ - mediatomb_LDADD = \ - libmediatomb.a \ - $(top_srcdir)/tombupnp/build/libtombupnp.a \ -+ -luuid \ - $(LIBEXIF_LDFLAGS) \ - $(ZLIB_LDFLAGS) \ - $(EXPAT_LDFLAGS) \ ---- a/build/libmediatomb_src -+++ b/build/libmediatomb_src -@@ -231,19 +231,6 @@ libmediatomb_a_SOURCES = \ - ../src/url.h \ - ../src/url_request_handler.cc \ - ../src/url_request_handler.h \ --../src/uuid/clear.c \ --../src/uuid/compare.c \ --../src/uuid/copy.c \ --../src/uuid/gen_uuid.c \ --../src/uuid/isnull.c \ --../src/uuid/pack.c \ --../src/uuid/parse.c \ --../src/uuid/unpack.c \ --../src/uuid/unparse.c \ --../src/uuid/uuid.h \ --../src/uuid/uuidP.h \ --../src/uuid/uuid_time.c \ --../src/uuid/uuid_types.h \ - ../src/web/action.cc \ - ../src/web/add.cc \ - ../src/web/add_object.cc \ diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch deleted file mode 100644 index 7de291a552b9..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-thumb-cache.patch +++ /dev/null @@ -1,237 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3291468&group_id=129766&atid=715782 - -[PATCH] Add the cache feature of ffmpegthumbnailer. - -I want the cache feature of ffmpegthumbnailer because my machine -is not powerful :-( -So I created this patch for the cache feature. - -This patch adds a new option "cache-dir" in config.xml. -If not specifying any string, the cache feature is disable. -And specifying some directory, the cache feature is enable -and the cache files will be created under the directory. - -Signed-off-by: Ken'ichi Ohmichi <ken1ohmichi@gmail.com> ---- -diff --git a/src/common.h b/src/common.h -index d1998b3..358f4d1 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -367,6 +367,8 @@ - #define DEFAULT_FFMPEGTHUMBNAILER_FILMSTRIP_OVERLAY YES - #define DEFAULT_FFMPEGTHUMBNAILER_WORKAROUND_BUGS NO - #define DEFAULT_FFMPEGTHUMBNAILER_IMAGE_QUALITY 8 -+ #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED YES -+ #define DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR "" - #endif - - #if defined(HAVE_LASTFMLIB) -diff --git a/src/config_manager.cc b/src/config_manager.cc -index 8c975f8..2902090 100644 ---- a/src/config_manager.cc -+++ b/src/config_manager.cc -@@ -1873,6 +1873,24 @@ void ConfigManager::validate(String serverhome) - - NEW_INT_OPTION(temp_int); - SET_INT_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_IMAGE_QUALITY); -+ -+ temp = getOption("/server/extended-runtime-options/ffmpegthumbnailer/" -+ "cache-dir", DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR); -+ -+ NEW_OPTION(temp); -+ SET_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR); -+ -+ temp = getOption("/server/extended-runtime-options/ffmpegthumbnailer/" -+ "cache-dir/attribute::enabled", -+ DEFAULT_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED); -+ -+ if (!validateYesNo(temp)) -+ throw _Exception(_("Error in config file: " -+ "invalid \"enabled\" attribute value in " -+ "ffmpegthumbnailer <cache-dir> tag")); -+ -+ NEW_BOOL_OPTION(temp == YES ? true : false); -+ SET_BOOL_OPTION(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED); - } - #endif - -diff --git a/src/config_manager.h b/src/config_manager.h -index 52b9842..a447a60 100644 ---- a/src/config_manager.h -+++ b/src/config_manager.h -@@ -110,6 +110,8 @@ typedef enum - CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_FILMSTRIP_OVERLAY, - CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_WORKAROUND_BUGS, - CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_IMAGE_QUALITY, -+ CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED, -+ CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR, - #endif - CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_ENABLED, - CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_STRING_MODE_PREPEND, -diff --git a/src/metadata/ffmpeg_handler.cc b/src/metadata/ffmpeg_handler.cc -index a637d9c..8e7ef23 100644 ---- a/src/metadata/ffmpeg_handler.cc -+++ b/src/metadata/ffmpeg_handler.cc -@@ -50,6 +50,9 @@ - // INT64_C is not defined in ffmpeg/avformat.h but is needed - // macro defines included via autoconfig.h - #include <stdint.h> -+#include <sys/stat.h> -+#include <errno.h> -+#include <string.h> - - //#ifdef FFMPEG_NEEDS_EXTERN_C - extern "C" -@@ -279,6 +282,122 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item) - av_close_input_file(pFormatCtx); - } - -+#ifdef HAVE_FFMPEGTHUMBNAILER -+ -+static int _mkdir(const char *path) -+{ -+ int ret = mkdir(path, 0777); -+ -+ if (ret == 0) { -+ // Make sure we are +x in case of restrictive umask that strips +x. -+ struct stat st; -+ if (stat(path, &st)) { -+ log_warning("could not stat(%s): %s\n", path, strerror(errno)); -+ return -1; -+ } -+ mode_t xbits = S_IXUSR | S_IXGRP | S_IXOTH; -+ if (!(st.st_mode & xbits)) { -+ if (chmod(path, st.st_mode | xbits)) { -+ log_warning("could not chmod(%s, +x): %s\n", path, strerror(errno)); -+ return -1; -+ } -+ } -+ } -+ -+ return ret; -+} -+ -+static bool makeThumbnailCacheDir(String& path) -+{ -+ char *path_temp = strdup(path.c_str()); -+ char *last_slash = strrchr(path_temp, '/'); -+ char *slash = last_slash; -+ bool ret = false; -+ -+ if (!last_slash) -+ return ret; -+ -+ // Assume most dirs exist, so scan backwards first. -+ // Avoid stat/access checks due to TOCTOU races. -+ errno = 0; -+ for (slash = last_slash; slash > path_temp; --slash) { -+ if (*slash != '/') -+ continue; -+ *slash = '\0'; -+ if (_mkdir(path_temp) == 0) { -+ // Now we can forward scan. -+ while (slash < last_slash) { -+ *slash = DIR_SEPARATOR; -+ if (_mkdir(path_temp) < 0) -+ // Allow EEXIST in case of someone else doing `mkdir`. -+ if (errno != EEXIST) -+ goto done; -+ slash += strlen(slash); -+ } -+ if (slash == last_slash) -+ ret = true; -+ break; -+ } else if (errno == EEXIST) { -+ ret = true; -+ break; -+ } else if (errno != ENOENT) { -+ break; -+ } -+ } -+ -+ done: -+ free(path_temp); -+ return ret; -+} -+ -+static String getThumbnailCacheFilePath(String& movie_filename, bool create) -+{ -+ Ref<ConfigManager> cfg = ConfigManager::getInstance(); -+ String cache_dir = cfg->getOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR); -+ -+ if (cache_dir.length() == 0) { -+ String home_dir = cfg->getOption(CFG_SERVER_HOME); -+ cache_dir = home_dir + "/cache-dir"; -+ } -+ -+ cache_dir = cache_dir + movie_filename + "-thumb.jpg"; -+ if (create && !makeThumbnailCacheDir(cache_dir)) -+ cache_dir = ""; -+ return cache_dir; -+} -+ -+static bool readThumbnailCacheFile(String movie_filename, uint8_t **ptr_img, size_t *size_img) -+{ -+ String path = getThumbnailCacheFilePath(movie_filename, false); -+ FILE *fp = fopen(path.c_str(), "rb"); -+ if (!fp) -+ return false; -+ -+ size_t bytesRead; -+ uint8_t buffer[1024]; -+ *ptr_img = NULL; -+ *size_img = 0; -+ while ((bytesRead = fread(buffer, 1, sizeof(buffer), fp)) > 0) { -+ *ptr_img = (uint8_t *)realloc(*ptr_img, *size_img + bytesRead); -+ memcpy(*ptr_img + *size_img, buffer, bytesRead); -+ *size_img += bytesRead; -+ } -+ fclose(fp); -+ return true; -+} -+ -+static void writeThumbnailCacheFile(String movie_filename, uint8_t *ptr_img, int size_img) -+{ -+ String path = getThumbnailCacheFilePath(movie_filename, true); -+ FILE *fp = fopen(path.c_str(), "wb"); -+ if (!fp) -+ return; -+ fwrite(ptr_img, sizeof(uint8_t), size_img, fp); -+ fclose(fp); -+} -+ -+#endif -+ - Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size) - { - *data_size = -1; -@@ -288,6 +407,18 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t - if (!cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_ENABLED)) - return nil; - -+ if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) { -+ uint8_t *ptr_image; -+ size_t size_image; -+ if (readThumbnailCacheFile(item->getLocation(), -+ &ptr_image, &size_image)) { -+ *data_size = (off_t)size_image; -+ Ref<IOHandler> h(new MemIOHandler(ptr_image, size_image)); -+ free(ptr_image); -+ log_debug("Returning cached thumbnail for file: %s\n", item->getLocation().c_str()); -+ return h; -+ } -+ } - #ifdef FFMPEGTHUMBNAILER_OLD_API - video_thumbnailer *th = create_thumbnailer(); - image_data *img = create_image_data(); -@@ -318,6 +449,10 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t - #endif // old api - throw _Exception(_("Could not generate thumbnail for ") + - item->getLocation()); -+ if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) { -+ writeThumbnailCacheFile(item->getLocation(), -+ img->image_data_ptr, img->image_data_size); -+ } - - *data_size = (off_t)img->image_data_size; - Ref<IOHandler> h(new MemIOHandler((void *)img->image_data_ptr, diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch deleted file mode 100644 index 70658c495d25..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-thumbnail-locking.patch +++ /dev/null @@ -1,71 +0,0 @@ -if you try to generate a bunch of thumbnails at once, it can crash: - -Program received signal SIGABRT, Aborted. -[Switching to Thread 0x7fdb7a6cb700 (LWP 17295)] -0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 -56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. -(gdb) bt -#0 0x00007fdb8031c899 in __GI_raise (sig=sig@entry=0x6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 -#1 0x00007fdb8031de27 in __GI_abort () at abort.c:89 -#2 0x00007fdb7f6b9222 in ff_unlock_avcodec () at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:2767 -#3 0x00007fdb7f6b9662 in avcodec_open2 (avctx=0x7fdb64032080, codec=<optimized out>, options=0x0) at /var/tmp/portage/media-video/ffmpeg-1.2.6/work/ffmpeg-1.2.6/libavcodec/utils.c:1132 -#4 0x00007fdb81be57bb in ffmpegthumbnailer::MovieDecoder::initializeVideo (this=this@entry=0x7fdb7a6ca000) at libffmpegthumbnailer/moviedecoder.cpp:176 -#5 0x00007fdb81be599c in ffmpegthumbnailer::MovieDecoder::initialize (this=0x7fdb7a6ca000, filename=...) at libffmpegthumbnailer/moviedecoder.cpp:86 -#6 0x00007fdb81be92cc in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., imageWriter=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:118 -#7 0x00007fdb81be97b4 in ffmpegthumbnailer::VideoThumbnailer::generateThumbnail (this=this@entry=0x7fdb6402af90, videoFile=..., type=<optimized out>, type@entry=Jpeg, buffer=..., pAvContext=pAvContext@entry=0x0) at libffmpegthumbnailer/videothumbnailer.cpp:191 -#8 0x00007fdb81bea23e in video_thumbnailer_generate_thumbnail_to_buffer (thumbnailer=<optimized out>, movie_filename=0x7fdb7003abc0 "........mp4", generated_image_data=0x7fdb64022680) at libffmpegthumbnailer/videothumbnailerc.cpp:113 -#9 0x00000000004ebfed in FfmpegHandler::serveContent (this=this@entry=0x7fdb64020ff0, item=..., resNum=resNum@entry=0x1, data_size=data_size@entry=0x7fdb7a6caaf0) at ../src/metadata/ffmpeg_handler.cc:475 -#10 0x00000000004e48d7 in FileRequestHandler::open (this=<optimized out>, filename=<optimized out>, info=0x7fdb7a6caaf0, mode=<optimized out>) at ../src/file_request_handler.cc:575 -#11 0x00000000004bba74 in web_open (filename=0x7fdb640175f0 "/content/media/object_id/16634/res_id/1/rh/6/ext/file.jpg", info=0x7fdb7a6caaf0, mode=UPNP_READ) at ../src/web_callbacks.cc:198 -#12 0x000000000052674b in process_request (Fp=<synthetic pointer>, RespInstr=0x7fdb7a6cab70, alias=0x7fdb7a6cab20, filename=0x7fdb7a6caad0, headers=0x7fdb7a6caab0, rtype=<synthetic pointer>, req=0x7fdb7a6cacd0) at ../upnp/src/genlib/net/http/webserver.c:1343 -#13 web_server_callback (parser=0x7fdb7a6cacd0, req=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/net/http/webserver.c:1803 -#14 0x000000000051f29a in dispatch_request (hparser=0x7fdb7a6cacd0, info=0x7fdb7a6cacc0) at ../upnp/src/genlib/miniserver/miniserver.c:236 -#15 handle_request (args=0x7fdb6c000c40) at ../upnp/src/genlib/miniserver/miniserver.c:339 -#16 0x000000000052cc66 in WorkerThread (arg=0x7a80e0 <gRecvThreadPool>) at ../threadutil/src/ThreadPool.c:594 -#17 0x00007fdb80697333 in start_thread (arg=0x7fdb7a6cb700) at pthread_create.c:309 -#18 0x00007fdb803d226d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:111 -(gdb) - ---- a/src/metadata/ffmpeg_handler.cc -+++ b/src/metadata/ffmpeg_handler.cc -@@ -311,6 +311,10 @@ void FfmpegHandler::fillMetadata(Ref<CdsItem> item) - - #ifdef HAVE_FFMPEGTHUMBNAILER - -+// The ffmpegthumbnailer code (ffmpeg?) is not threading safe. -+// Add a lock around the usage to avoid crashing randomly. -+static pthread_mutex_t thumb_lock; -+ - static int _mkdir(const char *path) - { - int ret = mkdir(path, 0777); -@@ -446,6 +450,9 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t - return h; - } - } -+ -+ pthread_mutex_lock(&thumb_lock); -+ - #ifdef FFMPEGTHUMBNAILER_OLD_API - video_thumbnailer *th = create_thumbnailer(); - image_data *img = create_image_data(); -@@ -474,8 +481,11 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t - if (video_thumbnailer_generate_thumbnail_to_buffer(th, - item->getLocation().c_str(), img) != 0) - #endif // old api -+ { -+ pthread_mutex_unlock(&thumb_lock); - throw _Exception(_("Could not generate thumbnail for ") + - item->getLocation()); -+ } - if (cfg->getBoolOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR_ENABLED)) { - writeThumbnailCacheFile(item->getLocation(), - img->image_data_ptr, img->image_data_size); -@@ -491,6 +501,7 @@ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t - video_thumbnailer_destroy_image_data(img); - video_thumbnailer_destroy(th); - #endif// old api -+ pthread_mutex_unlock(&thumb_lock); - return h; - #else - return nil; diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch deleted file mode 100644 index 9961b5fede1f..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-time-t.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 73d12ad230a4ef4694f8d58b249ec6c2804ee324 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 5 Apr 2016 22:56:27 -0400 -Subject: [PATCH] fix storage quoting with long long values - -On 32-bit systems w/64-bit time_t's (like the x32 ABI) we fail to build: -../src/storage/sql_storage.cc: In member function 'virtual void SQLStorage::autoscanUpdateLM(zmm::Ref<AutoscanDirectory>)': -../src/storage/sql_storage.cc:2139:81: error: call of overloaded 'quote(time_t)' is ambiguous - << " SET " << TQ("last_modified") << '=' << quote(adir->getPreviousLMT()) - -Handle long long types explicitly to fix that. ---- - src/storage/mysql/mysql_storage.h | 1 + - src/storage/sql_storage.h | 1 + - src/storage/sqlite3/sqlite3_storage.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/storage/mysql/mysql_storage.h b/src/storage/mysql/mysql_storage.h -index c377d76..eaec12c 100644 ---- a/src/storage/mysql/mysql_storage.h -+++ b/src/storage/mysql/mysql_storage.h -@@ -55,6 +55,7 @@ private: - virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); } - virtual inline zmm::String quote(bool val) { return zmm::String(val ? '1' : '0'); } - virtual inline zmm::String quote(char val) { return quote(zmm::String(val)); } -+ virtual inline zmm::String quote(long long val) { return zmm::String::from(val); } - virtual zmm::Ref<SQLResult> select(const char *query, int length); - virtual int exec(const char *query, int length, bool getLastInsertId = false); - virtual void storeInternalSetting(zmm::String key, zmm::String value); -diff --git a/src/storage/sql_storage.h b/src/storage/sql_storage.h -index 833693a..bd1afc3 100644 ---- a/src/storage/sql_storage.h -+++ b/src/storage/sql_storage.h -@@ -81,6 +81,7 @@ public: - virtual zmm::String quote(unsigned long val) = 0; - virtual zmm::String quote(bool val) = 0; - virtual zmm::String quote(char val) = 0; -+ virtual zmm::String quote(long long val) = 0; - virtual zmm::Ref<SQLResult> select(const char *query, int length) = 0; - virtual int exec(const char *query, int length, bool getLastInsertId = false) = 0; - -diff --git a/src/storage/sqlite3/sqlite3_storage.h b/src/storage/sqlite3/sqlite3_storage.h -index d825bd4..be6294d 100644 ---- a/src/storage/sqlite3/sqlite3_storage.h -+++ b/src/storage/sqlite3/sqlite3_storage.h -@@ -160,6 +160,7 @@ private: - virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); } - virtual inline zmm::String quote(bool val) { return zmm::String(val ? '1' : '0'); } - virtual inline zmm::String quote(char val) { return quote(zmm::String(val)); } -+ virtual inline zmm::String quote(long long val) { return zmm::String::from(val); } - virtual zmm::Ref<SQLResult> select(const char *query, int length); - virtual int exec(const char *query, int length, bool getLastInsertId = false); - virtual void storeInternalSetting(zmm::String key, zmm::String value); --- -2.7.4 - diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch deleted file mode 100644 index 6001d2fc5661..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1-youtube-dl.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- mediatomb-0.12.1.orig/src/youtube_video_url.cc 2013-12-17 22:46:24.272442249 +0000 -+++ mediatomb-0.12.1/src/youtube_video_url.cc 2013-12-17 22:57:25.968039083 +0000 -@@ -117,89 +117,68 @@ String YouTubeVideoURL::getVideoURL(Stri - - watch = _(YOUTUBE_URL_WATCH) + video_id; - -- Ref<URL> url(new URL(YOUTUBE_PAGESIZE)); -+ /* -+ * NOTE ON PATCH: -+ * -+ * The original code does not seem to work anymore. -+ * -+ * I have commented-out all the original code, and instead -+ * replaced it with a call/exec to youtube-dl (this is a separate/stand-alone python script). -+ * -+ * Available at http://rg3.github.io/youtube-dl/ -+ * -+ * -+ * The current code works on a/my samsung TV. I have not tested it further on other devices. -+ * (I needed a quick fix, because I wanted to watch some video's. :) ) -+ * -+ * I thought I would share the results. -+ * -+ * Suggestions / feedback -> bas-patch@tcfaa.nl -+ * -+ * Regards, Bas Nedermeijer -+ */ -+ -+ int pipefd[2]; -+ pipe(pipefd); -+ -+ if (fork() == 0) -+ { -+ // close reading end in the child -+ close(pipefd[0]); -+ -+ // send stdout to the pipe -+ dup2(pipefd[1], 1); -+ // send stderr to the pipe -+ dup2(pipefd[1], 2); - -- Ref<StringBuffer> buffer = url->download(watch, &retcode, curl_handle, -- false, verbose, true); -- if (retcode != 200) -- { -- throw _Exception(_("Failed to get URL for video with id ") -- + watch + _("HTTP response code: ") + -- String::from(retcode)); -- } -+ // this descriptor is no longer needed -+ close(pipefd[1]); - -- log_debug("------> GOT BUFFER %s\n", buffer->toString().c_str()); -- -- Ref<Matcher> matcher = reVideoURLParams->matcher(buffer->toString()); -- String params; -- if (matcher->next()) -- { --// params = trim_string(matcher->group(1)); -- params = trim_string( matcher->group( 0 ) ); -- /* -- int brace = params.index( '{' ); -- if ( brace > 0 ) -- params = params.substring( brace ); -- brace = params.index( '}' ); -- if ( brace > 0 ) -- params = params.substring( 0, brace + 1 ); -- */ -- Ref<Matcher> m2 = param_t->matcher(params); -- if (m2->next()) -- { -- String hmm = m2->group(1); -- if (string_ok(hmm)) -- params = hmm; -- else -- { -- throw _Exception(_("Could not retrieve \"t\" parameter.")); -- } -- } -+ // This code assumes youtube-dl is available for usage. -+ execl("/usr/bin/youtube-dl", "/usr/bin/youtube-dl","-g",watch.c_str(),NULL); - } - else - { -- throw _Exception(_("Failed to get URL for video with id (step 1)") + video_id); -- } -+ // parent -+ char buffery[8192]; -+ memset(&buffery[0], 0, sizeof(buffery)); - -- params = _(YOUTUBE_URL_GET) + YOUTUBE_URL_PARAM_VIDEO_ID + '=' + -- video_id + '&' + YOUTUBE_URL_PARAM_T + '=' + params; -+ close(pipefd[1]); // close the write end of the pipe in the parent - -- if (mp4) -- { -- String format = _("&fmt=18"); -- -- if (hd) -+ // Hopefully the read is never called twice, otherwise the buffer will become corrupt. -+ while (read(pipefd[0], buffery, sizeof(buffery)) != 0) - { -- matcher = HD->matcher(buffer->toString()); -- if (matcher->next()) -- { -- if (trim_string(matcher->group(1)) == "true") -- format = _("&fmt=22"); -- } - } -- -- params = params + format; -- } - -- buffer = url->download(params, &retcode, curl_handle, true, verbose, true); -+ log_debug("------> GOT BUFFER %s\n", buffery); -+ String result = _(buffery); - -- matcher = redirectLocation->matcher(buffer->toString()); -- if (matcher->next()) -- { -- if (string_ok(trim_string(matcher->group(1)))) -- return trim_string(matcher->group(1)); -- else -- throw _Exception(_("Failed to get URL for video with id (step 2)")+ -- video_id); -- } -+ result = trim_string(result); - -- if (retcode != 303) -- { -- throw _Exception(_("Unexpected reply from YouTube: ") + -- String::from(retcode)); -- } -+ log_debug("------> GOT BUFFER (after trimming) %s\n", result.c_str()); - -- throw _Exception(_("Could not retrieve YouTube video URL")); -+ return result; -+ } - } - - #endif//YOUTUBE diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1.initd b/net-misc/mediatomb/files/mediatomb-0.12.1.initd deleted file mode 100644 index 6c7989d89d66..000000000000 --- a/net-misc/mediatomb/files/mediatomb-0.12.1.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - # In order to properly support this (need vs use), we would have to - # parse ${MEDIATOMB_CONFIG} and see if mysql is enabled and if it is - # pointing to the local system. #368409 - use mysql -} - -start() { - ebegin "Starting MediaTomb" - start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \ - --pidfile ${MEDIATOMB_PIDFILE} -- --daemon \ - --pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \ - --group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \ - --config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \ - ${MEDIATOMB_OPTIONS} - eend $? -} - -stop () { - ebegin "Stopping MediaTomb" - start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE} - eend $? -} diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild deleted file mode 100644 index dbd677893117..000000000000 --- a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils linux-info user - -DEB_VER="5" -DESCRIPTION="MediaTomb is an open source UPnP MediaServer" -HOMEPAGE="http://www.mediatomb.cc/" - -SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" - -IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm - libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib" -REQUIRED_USE=" - || ( mysql sqlite ) - taglib? ( !id3tag ) - id3tag? ( !taglib ) - thumbnail? ( ffmpeg !libextractor ) - ffmpeg? ( !libextractor ) - libextractor? ( !ffmpeg !thumbnail ) -" - -DEPEND="mysql? ( virtual/mysql ) - dev-libs/expat - id3tag? ( media-libs/id3lib ) - javascript? ( >=dev-lang/spidermonkey-1.8.5:0 ) - taglib? ( media-libs/taglib ) - sqlite? ( >=dev-db/sqlite-3 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - libextractor? ( media-libs/libextractor ) - mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) - ffmpeg? ( virtual/ffmpeg ) - flac? ( media-libs/flac ) - thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) - curl? ( net-misc/curl net-misc/youtube-dl ) - magic? ( sys-apps/file ) - sys-apps/util-linux - zlib? ( sys-libs/zlib ) - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -pkg_setup() { - enewgroup mediatomb - enewuser mediatomb -1 -1 /dev/null mediatomb -} - -src_prepare() { - # Apply Debians patchset - local p dd="${WORKDIR}"/debian/patches - sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die - # We use our version as it seems to be more complete. - sed -i '/^0010_fix_libmp4v2_build.patch/d' "${dd}"/series || die - for p in $(<"${dd}"/series) ; do - epatch "${dd}"/${p} - done - - # libmp4v2 API breakage #410235 - epatch "${FILESDIR}"/${P}-libmp4v2.patch - - # Use system libuuid #270830 - epatch "${FILESDIR}"/${P}-system-uuid.patch - - # Support spidermonkey-187 #423991 #482392 - if has_version "~dev-lang/spidermonkey-1.8.7" ; then - epatch "${FILESDIR}"/${P}-mozjs187.patch - fi - - # Support libextractor-0.6.0 #435394 - epatch "${FILESDIR}"/${P}-libextractor.patch - - # Fix inotify and hard links - epatch "${FILESDIR}"/${P}-inotify-hard-links.patch - - # Add support for caching thumbnails - epatch "${FILESDIR}"/${P}-thumb-cache.patch - epatch "${FILESDIR}"/${P}-thumbnail-locking.patch - - # Respect AR #464710 - epatch "${FILESDIR}"/${P}-system-ar.patch - - # Add flac metadata support #494398 - epatch "${FILESDIR}"/${P}-flac-metadata.patch - - # Work around broken youtube support by using youtube-dl #467110 - epatch "${FILESDIR}"/${P}-youtube-dl.patch - - epatch "${FILESDIR}"/${P}-time-t.patch - - epatch_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable curl) \ - $(use_enable curl youtube) \ - $(use_enable debug tombdebug) \ - $(use_enable exif libexif) \ - $(use_enable ffmpeg) \ - $(use_enable flac FLAC) \ - $(use_enable id3tag id3lib) \ - $(use_enable inotify) \ - $(use_enable javascript libjs) \ - $(use_enable lastfm lastfmlib) \ - $(use_enable libextractor) \ - $(use_enable magic libmagic) \ - $(use_enable mp4 libmp4v2) \ - $(use_enable mysql) \ - $(use_enable sqlite sqlite3) \ - $(use_enable taglib) \ - $(use_enable thumbnail ffmpegthumbnailer) \ - $(use_enable zlib) \ - --enable-external-transcoding \ - --enable-protocolinfo-extension -} - -src_install() { - default - - newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN} - use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN} - newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN} - - insinto /etc/mediatomb - newins "${FILESDIR}/${PN}-0.12.0.config" config.xml - fperms 0600 /etc/mediatomb/config.xml - fowners mediatomb:mediatomb /etc/mediatomb/config.xml - - keepdir /var/lib/mediatomb - fowners mediatomb:mediatomb /var/lib/mediatomb -} - -pkg_postinst() { - if use mysql ; then - elog "MediaTomb has been built with MySQL support and needs" - elog "to be configured before being started." - elog "For more information, please consult the MediaTomb" - elog "documentation: http://mediatomb.cc/pages/documentation" - elog - fi - - elog "To configure MediaTomb edit:" - elog "/etc/mediatomb/config.xml" - elog - elog "The MediaTomb web interface can be reached at (after the service is started):" - elog "http://localhost:49152/" -} diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild deleted file mode 100644 index 3640a7bd24bc..000000000000 --- a/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils linux-info systemd user vcs-snapshot - -DESCRIPTION="MediaTomb is an open source UPnP MediaServer" -HOMEPAGE="http://www.mediatomb.cc/" -SRC_URI="https://github.com/v00d00/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm - libav +magic +mp4 mysql +sqlite +taglib thumbnail +zlib" -REQUIRED_USE=" - || ( mysql sqlite ) - taglib? ( !id3tag ) - id3tag? ( !taglib ) - thumbnail? ( ffmpeg ) -" - -DEPEND="mysql? ( virtual/mysql ) - dev-libs/expat - id3tag? ( media-libs/id3lib ) - javascript? ( >=dev-lang/spidermonkey-1.8.5:0 ) - taglib? ( media-libs/taglib ) - sqlite? ( >=dev-db/sqlite-3 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) - ffmpeg? ( - libav? ( >=media-video/libav-10:0= ) - !libav? ( >=media-video/ffmpeg-2.2:0= ) - ) - flac? ( media-libs/flac ) - thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) - curl? ( net-misc/curl net-misc/youtube-dl ) - magic? ( sys-apps/file ) - sys-apps/util-linux - zlib? ( sys-libs/zlib ) - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -pkg_setup() { - use inotify && linux-info_pkg_setup - - enewgroup mediatomb - enewuser mediatomb -1 -1 /dev/null mediatomb -} - -src_prepare() { - # Support spidermonkey-187 #423991 #482392 - if has_version "~dev-lang/spidermonkey-1.8.7" ; then - epatch "${FILESDIR}"/${PN}-0.12.1-mozjs187.patch - fi - - epatch_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable curl) \ - $(use_enable curl youtube) \ - $(use_enable debug tombdebug) \ - $(use_enable exif libexif) \ - $(use_enable ffmpeg) \ - $(use_enable flac) \ - $(use_enable id3tag id3lib) \ - $(use_enable inotify) \ - $(use_enable javascript libjs) \ - $(use_enable lastfm lastfm) \ - $(use_enable magic libmagic) \ - $(use_enable mp4 libmp4v2) \ - $(use_enable mysql) \ - $(use_enable sqlite sqlite3) \ - $(use_enable taglib) \ - $(use_enable thumbnail ffmpegthumbnailer) \ - --enable-external-transcoding \ - --enable-protocolinfo-extension -} - -src_install() { - default - - systemd_dounit "${S}"/scripts/systemd/"${PN}".service - use mysql && systemd_dounit "${S}"/scripts/systemd/"${PN}"-mysql.service - - newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN} - use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN} - newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN} - - insinto /etc/mediatomb - newins "${FILESDIR}/${PN}-0.12.0.config" config.xml - fperms 0600 /etc/mediatomb/config.xml - fowners mediatomb:mediatomb /etc/mediatomb/config.xml - - keepdir /var/lib/mediatomb - fowners mediatomb:mediatomb /var/lib/mediatomb -} - -pkg_postinst() { - if use mysql ; then - elog "MediaTomb has been built with MySQL support and needs" - elog "to be configured before being started." - elog "For more information, please consult the MediaTomb" - elog "documentation: http://mediatomb.cc/pages/documentation" - elog - fi - - elog "To configure MediaTomb edit:" - elog "/etc/mediatomb/config.xml" - elog - elog "The MediaTomb web interface can be reached at (after the service is started):" - elog "http://localhost:49152/" -} diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml deleted file mode 100644 index f49135825709..000000000000 --- a/net-misc/mediatomb/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thev00d00@gentoo.org</email> - <name>Ian Whyman</name> - </maintainer> - <maintainer type="project"> - <email>media-video@gentoo.org</email> - <name>Gentoo Video project</name> - </maintainer> - <use> - <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag> - <flag name="flac">Enable FLAC metadata/artwork support</flag> - <flag name="id3tag">Use <pkg>media-libs/libid3tag</pkg> for reading files' metadata rather than taglib</flag> - <flag name="inotify">Enable inotify filesystem monitoring support</flag> - <flag name="lastfm">Enable last.fm support</flag> - <flag name="libextractor">Use libextractor to gather files' metadata</flag> - <flag name="magic">Use libmagic to determine file types</flag> - <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> - <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag> - <flag name="thumbnail">Enables video thumbnails generation through <pkg>media-video/ffmpegthumbnailer</pkg></flag> - </use> - <upstream> - <remote-id type="github">v00d00/mediatomb</remote-id> - <remote-id type="sourceforge">mediatomb</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest index ad25f64b4cdb..59f988fab6fa 100644 --- a/net-misc/netkit-bootpd/Manifest +++ b/net-misc/netkit-bootpd/Manifest @@ -1,4 +1,4 @@ AUX netkit-bootpd-2.4.patch 19727 BLAKE2B a28eacff207bb59a4975830b8bbf5ba11a98d739ac3a5b172bc96beeb557eb231474f009744f2136c208c042e24eeaca82e57be40511774252fc7440327c3b00 SHA512 251fb2652c808bbfc18d4d1cdbe746aa3f52f09a53e3c09de426ab94ea6b016d6861e88f45f2cb0740fb5be3a76b6156a772f27d17221eb9f792ab3454c3282d DIST bootpd-2.4.tar.gz 99765 BLAKE2B ce435b562433e6cf2cc1ef0fe51b17d7d4b62c347749c6cff98af82f4af8934e23f19fa8f278e34497aea31b75b437a7bc3d59608454ac8eb42f0fd4c76da042 SHA512 aaed30b724c660973e2efac8c18ead48caf1e8e5e35d4af6c6476080c32f8ce8c8722fd1c18d864e557301d37615cbb313e2ab0140da8963fbd23d5000e60379 -EBUILD netkit-bootpd-2.4-r1.ebuild 745 BLAKE2B 4628dc6122855f882efef0c56af4d4ebe87c4656d342dd15f929c26d122ed5d9983262779838ddfc47f2f10ac3a292162af031ba480c8d030122aeaa114ca53d SHA512 33482a2d68c91b0bfca2d397083921bf83dbf6e71f6da59ad04c3ade91943ced4488650ad7991f55a0913a6a58ce4c9793f0da9ff48d2c78837021863f4b9d19 -MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f +EBUILD netkit-bootpd-2.4-r1.ebuild 734 BLAKE2B d5260b0cf7d0837b735df9b12f500fdbc769990e6b6afd6fe3fa310b5843da5fa994147eb91fe5a606a0558b5a2d7a09c6e34ccf71f0f1cf6f9a54a299ef23ac SHA512 2cb42cadb332d6154afd88108626945b39c1775b7cae51e9f95ada57806853675935b1368f6080dec5a68eda0d90d4d8f7790d612c2e15ca8368e4e1522ceb18 +MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b diff --git a/net-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml index a535b8852829..3c3d5ced6412 100644 --- a/net-misc/netkit-bootpd/metadata.xml +++ b/net-misc/netkit-bootpd/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>xmw@gentoo.org</email> -<name>Michael Weber</name> -</maintainer> + <maintainer type="person"> + <email>xmw@gentoo.org</email> + <name>Michael Weber</name> + </maintainer> </pkgmetadata> diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild index 7ae6c8941158..cb70f0e56efd 100644 --- a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild +++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit eutils toolchain-funcs +EAPI=6 + +inherit toolchain-funcs MY_P=${P/netkit-} @@ -17,20 +18,22 @@ IUSE="" S=${WORKDIR}/${MY_P} -src_prepare() { - epatch "${FILESDIR}"/${P}.patch +PATCHES=( "${FILESDIR}"/${P}.patch ) + +src_configure() { + tc-export CC } src_compile() { - tc-export CC - emake linux || die + emake linux } src_install() { - dosbin bootp{d,ef,gw,test} || die + dosbin bootp{d,ef,gw,test} + local x for x in d ef gw test; do - dosym bootp${x} /usr/sbin/in.bootp${x} || die + dosym bootp${x} /usr/sbin/in.bootp${x} done doman *.5 *.8 diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest index 75a8b1f68900..618bc4d83816 100644 --- a/net-misc/openr2/Manifest +++ b/net-misc/openr2/Manifest @@ -1,4 +1,4 @@ -AUX 1.3.0-respect-user-cflags.patch 460 BLAKE2B a3eced9975c8d9bde331a05d2da8bef8577cbc83755fe102794b81733a83320798cc0abdefb70cfdd9f4824fde54c60bc542ffc7db017035c6db729aece514d7 SHA512 b644bb2ce9d789c6bb5c87914482203576165a0d0f59fb2b7c15662c5ff15c6a8e664bdbd1130bcfd1ef2244f8a55a4d5afacdccfde2e15b8b2a0219d65d564d +AUX openr2-1.3.0-fix-build-system.patch 855 BLAKE2B 0712ab876e8941f63756531597a861e433e2e3a8f457fcf62c83e3d5f32d1f0f809c2fb34ce362533d7a4e1d434132c0df81ddb656e3223f7dab1381001215b4 SHA512 6f71b83d1ec8a07a32a019784954148adde44b2fdfc982ec9d02deeae66fc307448f6577d715276de4cdde42f771d647d625d3111a6189cf60ae8f6c5c6c2d2e DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e -EBUILD openr2-1.3.0.ebuild 551 BLAKE2B 3a89c17c8c9fd28f73c6aa3b32dd268876181662c62f2f57331e2ebe85f34b32331b997255a2771196a4dcff5d483db1e5644db538339f8292c3346d0ad58bac SHA512 8108ee5d0c04d4951349b714d345ae3f9a94da14974fcf7e51d4437b5d0570847ea451f95a1623cc926a5465cc28e504b3cef95e28698e19a045ff396b0aa8db +EBUILD openr2-1.3.0.ebuild 642 BLAKE2B d9b0c9535138d24f4d5ee61300489d61d6208c47c8830de35fb656455fccf88d68cb0c107fea3ba8d0d8c928086b419fc0745fefaa972c8105db1ad1a02f9dd5 SHA512 bf60eb9b6729382d7e7d9b64511ae0af3cd274ba9d90c7eaec5726a6d3954bc3c4f4034d0ec4f42dc448cdb7206421be728477da08b7a19f604c50a6e3e215df MISC metadata.xml 321 BLAKE2B 3dc8aa546d5d86ecf848c338ebe8e931681f5cc3879187206e8dbd41378542f55e12f577a5826f873eaf315dff7f89c3a45394a90d73cde2ac43a65e92156ae5 SHA512 9c0374655261ecff333a0e004ad2fe9e0ddb79b0064f45e4ed03121caae7acb136b5ca10d8e86d74cde50ed62695aabbf80b47d493570c328f9d46956e4c2305 diff --git a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch deleted file mode 100644 index 7a8f23f3f29c..000000000000 --- a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr openr2-1.3.0.ORIG//configure.in openr2-1.3.0/configure.in ---- openr2-1.3.0.ORIG//configure.in 2010-05-13 11:59:14.000000000 +0100 -+++ openr2-1.3.0/configure.in 2010-05-13 11:59:35.000000000 +0100 -@@ -25,11 +25,6 @@ - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE - --# let's default to compile with debugging information --# most users will not even care about it --CFLAGS='-ggdb3 -O0' --CXXFLAGS='-ggdb3 -O0' -- - AC_PROG_CC - AC_PROG_LIBTOOL - AC_LANG([C]) diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch new file mode 100644 index 000000000000..59918934d563 --- /dev/null +++ b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch @@ -0,0 +1,30 @@ +--- a/configure.in ++++ b/configure.in +@@ -25,11 +25,6 @@ + AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE + +-# let's default to compile with debugging information +-# most users will not even care about it +-CFLAGS='-ggdb3 -O0' +-CXXFLAGS='-ggdb3 -O0' +- + AC_PROG_CC + AC_PROG_LIBTOOL + AC_LANG([C]) +diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,10 +1,10 @@ +-AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes + if WANT_OR2_TRACE_STACKS + AM_CFLAGS += -DOR2_TRACE_STACKS + endif + + if HAVE_SVNVERSION +-AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\" ++AM_CFLAGS += -DREVISION=\"0\" + endif + + lib_LTLIBRARIES = libopenr2.la diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild index d00d14389463..3e45c4921241 100644 --- a/net-misc/openr2/openr2-1.3.0.ebuild +++ b/net-misc/openr2/openr2-1.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit autotools base +EAPI=6 + +inherit autotools DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol" HOMEPAGE="http://libopenr2.org/" @@ -14,13 +15,21 @@ KEYWORDS="~amd64" IUSE="" RDEPEND="net-misc/dahdi" -PATCHES=( "${FILESDIR}/${PV}-respect-user-cflags.patch" ) +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) src_prepare() { - base_src_prepare + default + mv configure.{in,ac} || die eautoreconf } +src_configure() { + econf --disable-static +} + src_install() { - emake DESTDIR="${D}" install || die + default + find "${D}" -name '*.la' -delete || die } diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest index ad9b851df707..6479dd379a71 100644 --- a/net-misc/ssvnc/Manifest +++ b/net-misc/ssvnc/Manifest @@ -1,9 +1,6 @@ AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b4b93796694a98bf0f8e54d9e0b9822d675e2446be6082df9db7dc64c75c90dd87a452daf40daa5810ff4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be AUX Makefile.vncviewer 295 BLAKE2B 6eee05699e3f14d54b8b7fcaecc6843d08d2fcdbd292be2bba2a76f838c398edad8f5a9b46a6621f8611913a712d945d94cdaaca3ee8dc21d2573ed957334fbd SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625 -AUX ssvnc-1.0.27-build.patch 1393 BLAKE2B 0cc232fb07c039336c0b53f203e42b253f113d248d6abf7514d50c5ac2ff5c496e5ef27eb33e3e94c3c2d79eb20649e6521c6c0420d3ebd34f67520c0ce1ecf4 SHA512 2cc49d8c1e2c8db02f0bf680ac80f55595b606796e1501388649ca463b25d1a2a98bcc8646992f3f21c22ac775f7a8667951002ca03d40f3042ffb3c7c432f0e AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157 -DIST ssvnc-1.0.28.src.tar.gz 542796 BLAKE2B 121d78f18b0bb904b1aa15ccaa220beddabe500e77c9b483ba88b0d228f17a56174d83ca5746ecb4aeaef19e5efe87d47146d06e32f8abf196ae6c9a74a28b84 SHA512 8b86fc3ba971cae72878ba45a775b97b22c537c389d8ae3260e5d5657fe96c6ead51e3871bc8ff47bb5368d7e95c43250814be93508f0d403210b49c8393a712 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092 -EBUILD ssvnc-1.0.28.ebuild 1376 BLAKE2B 623fb0d409c8a2a25c9a976bc08d1bcf7dfed6bb662c5687a8e9e47608c42c148b2e4bb9954a3cc2a94ad23c7ea89ddb670c2ede1e871010718cefdb3003f205 SHA512 e3eea930fbb50ad4131fe1a8f3458631553193580b4c91fddea5efce282197100b76ee49e73867d109b1c53eb68ee7da7d8b439d538f9ac5538751f64456e201 -EBUILD ssvnc-1.0.29-r1.ebuild 1417 BLAKE2B acde400a13e7e65f78c7c7b7351b626ffa85e0aecc6a342af776c29f8612fd3b5c96e8d07abe9d5287dd199c8013c8fc379239ba43568c0a530b877f47f1480a SHA512 d73fd40c2f1c7e6b20a0b7b963e8669c3dd29b1390fe5d770a75b2371d2a23b2cc0a0816f25d5820e19964862cc073b4002a3af2b8c53272a9cea32731cab891 +EBUILD ssvnc-1.0.29-r1.ebuild 1426 BLAKE2B b7a9e1a7230f85a7e29db82154309a68d2b819d964ba345ad51a4e40b8afe8bf6d66ac91b6ea4da962d458a52d6b6e7fe57e9ad9643f5849f3d4e82d36640811 SHA512 5b9240cebc7ea3b2ffd9fb42f54665de0d8aade0b855d95b8ef2b2faa798e0dbe470dbd37df760533abb6825d3fac69c39bd13a290aedd2d9c3b8f804b1b72b2 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad diff --git a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch deleted file mode 100644 index dc433ac2d145..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3031380&group_id=243486&atid=1122548 - ---- a/vnc_unixsrc/vncviewer/sockets.c -+++ b/vnc_unixsrc/vncviewer/sockets.c -@@ -32,6 +32,7 @@ - #include <netdb.h> - #include <fcntl.h> - #include <assert.h> -+#include <ctype.h> - #include <vncviewer.h> - - #ifndef SOL_IPV6 ---- a/Makefile -+++ b/Makefile -@@ -21,11 +21,11 @@ - - # N.B. ?= is gnu make specific. Some of the subdir Makefiles are too. - # --PREFIX ?= /usr/local --ROOT ?= -+PREFIX = /usr -+ROOT = $(DESTDIR) - BIN = bin - LIB = lib/ssvnc - MAN = man --MANDIR ?= $(MAN) -+MANDIR = share/$(MAN) - APPS ?= share/applications - BINNAME ?= ssvncviewer -@@ -66,7 +66,6 @@ - - install: all - mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1 -- strip $(VIEWER) - cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB) ---- a/vncstorepw/Makefile -+++ b/vncstorepw/Makefile -@@ -14,7 +14,6 @@ - - $(CMD): vncauth.o vncstorepw.o d3des.o - PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o -- PATH=$$PATH:$(EPATH) strip $(CMD) - @ls -l $(CMD) - - $(UNWRAP): unwrap.c -@@ -41,7 +40,6 @@ - else \ - PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \ - fi -- PATH=$$PATH:$(EPATH) strip $(ULTDSM) - @ls -l $(ULTDSM) - - test: $(CMD) - diff --git a/net-misc/ssvnc/ssvnc-1.0.28.ebuild b/net-misc/ssvnc/ssvnc-1.0.28.ebuild deleted file mode 100644 index 3e9f88e5d8be..000000000000 --- a/net-misc/ssvnc/ssvnc-1.0.28.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" -inherit eutils multilib toolchain-funcs - -DESCRIPTION="VNC viewer that adds encryption security to VNC connections" -HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html" -SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="java" - -RDEPEND="sys-libs/zlib - virtual/jpeg - dev-libs/openssl - dev-lang/tk - net-misc/stunnel - java? ( virtual/jre ) - x11-terms/xterm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXaw - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXpm - x11-libs/libXt" -DEPEND="${RDEPEND} - java? ( virtual/jdk )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.27-build.patch - - sed -i \ - -e "/^LIB/s:lib/:$(get_libdir)/:" \ - -e "$(use java || echo '/^JSRC/s:=.*:=:')" \ - Makefile - sed -i \ - -e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \ - vncstorepw/Makefile - - cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile - cd "${S}"/vnc_unixsrc/vncviewer - sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in - cp "${FILESDIR}"/Makefile.vncviewer Makefile -} - -src_compile() { - tc-export AR CC CXX RANLIB - emake all || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || \ - die "make install failed" - dodoc README -} diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild index d0524154cc1c..f31d0f32cd6f 100644 --- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild +++ b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="java" RDEPEND="sys-libs/zlib - virtual/jpeg - dev-libs/openssl - dev-lang/tk + virtual/jpeg:0 + dev-libs/openssl:0= + dev-lang/tk:0 net-misc/stunnel - java? ( virtual/jre ) + java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libICE x11-libs/libSM |