media-tv/kodi: run epatch_user before regenerating files #562092

diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 7740ec6725abea4c79ea81e02fce7a3afed95bda..7ad19f1c384b77cb63100f565ee8ae1e12e4ba6e 100644 (file)
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -154,6 +154,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36
        epatch "${FILESDIR}"/${P}-gcc-5.patch #557300
+       epatch_user #293109
+
        # The mythtv patch touches configure.ac, so force a regen
        rm -f configure
 
@@ -185,8 +187,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }

diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index 912c5e5822e2d34bf4b4d69ff0f0671bcb892fb2..198691d55e441da14e13dc57b8a46f8a3cadd188 100644 (file)
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${P}-texturepacker.patch
        epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
+       epatch_user #293109
 
        # some dirs ship generated autotools, some dont
        multijob_init
@@ -189,8 +190,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 165dacba6b061a1b8107f66eacd5878bcfb08a41..bf985284ef28258cd7ce65b3511ebbead3ebc9ac 100644 (file)
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -155,6 +155,7 @@ src_unpack() {
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
+       epatch_user #293109
 
        # some dirs ship generated autotools, some dont
        multijob_init
@@ -189,8 +190,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }