From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-sound/pitchtune/Manifest | 3 +- .../files/pitchtune-0.0.4-fno-common.patch | 394 +++++++++++++++++++++ media-sound/pitchtune/pitchtune-0.0.4.ebuild | 23 +- 3 files changed, 407 insertions(+), 13 deletions(-) create mode 100644 media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch (limited to 'media-sound/pitchtune') diff --git a/media-sound/pitchtune/Manifest b/media-sound/pitchtune/Manifest index 02458a464163..852608cd1ec4 100644 --- a/media-sound/pitchtune/Manifest +++ b/media-sound/pitchtune/Manifest @@ -1,4 +1,5 @@ +AUX pitchtune-0.0.4-fno-common.patch 11264 BLAKE2B d332527cbd7b0597d1b644596a367ece82030f07987e3303c9aa9b7c4590e074231ac651888e1eb4b4a1bcca07144f3b68570150eb16c7fc88aa93af2e89dbe1 SHA512 741b46ce7b9e8de82703b8e86779788712f28bbe258b1c9e2fd8840ead1d064fa5be0c4a4a18d8f293c8b4f283e218e16be6587dd222ee09ac6ef8a54a6684f0 AUX pitchtune-0.0.4-lm.patch 208 BLAKE2B 8c6d5a9d2ea2ddefb03a1a15f02cb7ce5ebcdea42f5f307f7de90026da2da7c04a0b2e8dc82d84104b118ddf7e217584ca84dde254f07ab9bd28e6ff6c348245 SHA512 74fc3e0f5e42c9cc61ebaa19a4f0de3e0f4893a4a8a7a638e1a200152ff8b8b4c8c69b0bcc4d2eac51a9f11573ed19c8f0883e5a5755faafff29d3d76c0c9a19 DIST pitchtune-0.0.4.tar.gz 163348 BLAKE2B 472f57409967d7af54841245ef6b8477d9dca25b1708e5e9870729faadd6a294dc636e4e0cb6d2a617206790b5170e579f37fb8f92e41361a222b76f78cf3858 SHA512 7085dada0210ae5df8437e14de3fcd5fb5cba4305718b29b33730f737008451b9dba6e667b0caf8d57921c405de6205f288c8900db5c276ff401a9f5f0a3610a -EBUILD pitchtune-0.0.4.ebuild 688 BLAKE2B 7a081e8ca210722c64a13ad8bb6a146436ff56bf8fb5ae3f176fd7b62609a5ab300db126f79a40d49c3357033cb05918afe1c8c783c97e3de5961d315f24b9bc SHA512 14a3aaaf0d7d0baa73abe98de0d89caca61d4e8416cc5fd0a055cd53195614c6e41faaba0f3f553b558b80f4fa65e320054c3e72b3782ad55c011fdc3e4c44ad +EBUILD pitchtune-0.0.4.ebuild 742 BLAKE2B 969de850ec3d1a3c4d98434b5f5177ef4f25243fdf5843e55143b972f88579f02f163c56b6f11a0cd33cbbcc0444c120e27be034079141cc2888dd283fe2f91c SHA512 e37a0936940d583f6c5814c2ca34ff68b81401008e5bc542edc4726acb52aed06dbee8e509964ddf003b4d8b32ac6c90425e53680bd45964309fdf5ce9bdc42c MISC metadata.xml 342 BLAKE2B 2c5b23966307252ad5f996f763e0bf0817f95c254796c6cf18f25c322f79dce52e138b0585ea8ebc3c0969842e6b8d92896261c04438966cb23379fe07ba253a SHA512 f1d19843fe070069700704bc96d0d195080b9a3e71569829771d9bb1269ae9c4c17ff478476c10fbe4993ff30e38d887bd5344d635ab40095fefec82c6c00af2 diff --git a/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch b/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch new file mode 100644 index 000000000000..4a5ee83dbb1b --- /dev/null +++ b/media-sound/pitchtune/files/pitchtune-0.0.4-fno-common.patch @@ -0,0 +1,394 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -35,6 +35,99 @@ + #include + #include "main.h" + ++GtkWidget *window_main; ++GtkWidget *drawingarea1; ++GtkWidget *spinbutton_freq; ++GtkWidget *spinbutton_a1freq; ++GtkWidget *optionmenu_noteselect; ++GtkWidget *optionmenu_noteselect_menu; ++GtkWidget *checkbutton_ministep_freq; ++GtkWidget *checkbutton_ministep_a1freq; ++GtkWidget *checkbutton_coarse_tuning; ++GtkWidget *hscale_finetune; ++GtkWidget *hscale_coarsetune; ++GtkWidget *label_freqwarn; ++GtkWidget *mmenu_item_sel_guitar; ++GtkWidget *mmenu_item_small_display; ++GtkWidget *button_muting1; ++GtkAdjustment *adjustment_finetune; ++GtkAdjustment *adjustment_coarsetune; ++GdkPixmap *gdkpixmap1; ++ ++GtkWidget *window_settings; ++GtkWidget *settings_entry_sounddev; ++GtkWidget *settings_alsa_device; ++GtkWidget *settings_radiobutton_scale_1; ++GtkWidget *settings_radiobutton_scale_2; ++ ++GtkWidget *fileselection1; ++ ++GtkWidget *about_dialog; ++ ++GtkWidget *help_dialog; ++ ++GtkWidget *debug_window; ++GtkWidget *debug_text_box; ++ ++GdkImage *gdkimage1; ++GdkVisual *gdkvisual1; ++ ++GdkGC *GdkGC_black; ++GdkGC *GdkGC_red; ++ ++struct sel_guitar_config sel_guitar_config; ++struct main_config main_config; ++struct config config; ++ ++int tuner_started; ++ ++u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; ++int soundbuffer_len; ++int soundbuffer_readpos; ++int soundbuffer_writepos; ++double backto_lastdraw_samplecount; ++ ++u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; ++int samplepieces_which_is_zero; ++int samplepieces_count; ++int samplepieces_count_finetune; ++int samplepieces_count_coarsetune; ++int samplepieces_last_valid; ++ ++double frequency; ++gboolean frequency_set; ++double wavelength_samples; ++int samplerate; ++double downsample_ratio; ++ ++int tuner_mode_coarse; ++int tuner_mode_coarse_new; ++ ++gboolean notes_note_set; ++int notes_note; ++ ++int timer_tag; ++int timer_count; ++ ++int sound_fd; ++ ++int spinbutton_freq_changed_by_user; ++ ++gboolean displaystate_is_splash; ++ ++gboolean display_big; ++gboolean display_cleared_around; ++ ++int sel_standard_note; ++int sel_standard_octave; ++int sel_standard_last_octave; ++gboolean sel_standard_last_octave_valid; ++int sel_standard_last_scale_type; ++ ++GString *gstr_sounddev; ++GString *gstr_alsa_device; ++int scale_type; ++ + #include "main_img001.h" + + +--- a/src/main.h ++++ b/src/main.h +@@ -92,12 +92,12 @@ + + /* Scale note strings */ + #define SCALE_COUNT 2 +-const char *(note_chars_lowercase_multi[2][12]); +-const char *(note_chars_uppercase_multi[2][12]); ++extern const char *(note_chars_lowercase_multi[2][12]); ++extern const char *(note_chars_uppercase_multi[2][12]); + + /* Menu entry names */ + #define MENU_ENTRIES 6 +-const char *menu_entry[MENU_ENTRIES]; ++extern const char *menu_entry[MENU_ENTRIES]; + + + +@@ -119,69 +119,71 @@ + /* GTK variables */ + + /* Main window */ +-GtkWidget *window_main; +-GtkWidget *drawingarea1; +-GtkWidget *spinbutton_freq; +-GtkWidget *spinbutton_a1freq; +-GtkWidget *optionmenu_noteselect; +-GtkWidget *optionmenu_noteselect_menu; +-GtkWidget *checkbutton_ministep_freq; +-GtkWidget *checkbutton_ministep_a1freq; +-GtkWidget *checkbutton_coarse_tuning; +-GtkWidget *hscale_finetune; +-GtkWidget *hscale_coarsetune; +-GtkWidget *label_freqwarn; +-GtkWidget *mmenu_item_sel_guitar; +-GtkWidget *mmenu_item_small_display; +-GtkWidget *button_muting1; +-GtkAdjustment *adjustment_finetune; +-GtkAdjustment *adjustment_coarsetune; +-GdkPixmap *gdkpixmap1; ++extern GtkWidget *window_main; ++extern GtkWidget *drawingarea1; ++extern GtkWidget *spinbutton_freq; ++extern GtkWidget *spinbutton_a1freq; ++extern GtkWidget *optionmenu_noteselect; ++extern GtkWidget *optionmenu_noteselect_menu; ++extern GtkWidget *checkbutton_ministep_freq; ++extern GtkWidget *checkbutton_ministep_a1freq; ++extern GtkWidget *checkbutton_coarse_tuning; ++extern GtkWidget *hscale_finetune; ++extern GtkWidget *hscale_coarsetune; ++extern GtkWidget *label_freqwarn; ++extern GtkWidget *mmenu_item_sel_guitar; ++extern GtkWidget *mmenu_item_small_display; ++extern GtkWidget *button_muting1; ++extern GtkAdjustment *adjustment_finetune; ++extern GtkAdjustment *adjustment_coarsetune; ++extern GdkPixmap *gdkpixmap1; + + /* Settings window */ +-GtkWidget *window_settings; +-GtkWidget *settings_entry_sounddev; +-GtkWidget *settings_alsa_device; +-GtkWidget *settings_radiobutton_scale_1; +-GtkWidget *settings_radiobutton_scale_2; ++extern GtkWidget *window_settings; ++extern GtkWidget *settings_entry_sounddev; ++extern GtkWidget *settings_alsa_device; ++extern GtkWidget *settings_radiobutton_scale_1; ++extern GtkWidget *settings_radiobutton_scale_2; + + /* Filesel window */ +-GtkWidget *fileselection1; ++extern GtkWidget *fileselection1; + + /* About dialog */ +-GtkWidget *about_dialog; ++extern GtkWidget *about_dialog; + + /* Help dialog */ +-GtkWidget *help_dialog; ++extern GtkWidget *help_dialog; + + /* Debug window */ +-GtkWidget *debug_window; +-GtkWidget *debug_text_box; ++extern GtkWidget *debug_window; ++extern GtkWidget *debug_text_box; + + /* GdkImage containing the drawn waves */ +-GdkImage *gdkimage1; ++extern GdkImage *gdkimage1; + /* GdkVisual for drawingarea1 */ +-GdkVisual *gdkvisual1; ++extern GdkVisual *gdkvisual1; + + /* Graphics Contexts */ +-GdkGC *GdkGC_black; +-GdkGC *GdkGC_red; ++extern GdkGC *GdkGC_black; ++extern GdkGC *GdkGC_red; + + /* Configuration structures */ +-struct ++struct sel_guitar_config + { + struct config_struct_window window; +-} sel_guitar_config; ++}; ++extern struct sel_guitar_config sel_guitar_config; + +-struct ++struct main_config + { + struct config_struct_window window; +-} main_config; ++}; ++extern struct main_config main_config; + + /** + * \brief Holds configuration from reading config file to realizing the configuration + */ +-struct ++struct config + { + gboolean sel_guitar_visible; + double a1frequency; +@@ -194,74 +196,75 @@ + int menu_accel_key[MENU_ENTRIES]; + int menu_accel_mods[MENU_ENTRIES]; + double play_sine; +-} config; ++}; ++extern struct config config; + + /* --- */ +-int tuner_started; /**< Has the tuner been started? */ ++extern int tuner_started; /**< Has the tuner been started? */ + + /* Sound buffer */ +-u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; /* Rotating buffer */ +-int soundbuffer_len; +-int soundbuffer_readpos; +-int soundbuffer_writepos; +-double backto_lastdraw_samplecount; /* Samples from writepos */ ++extern u_int8_t soundbuffer[SOUNDBUFFER_SIZE]; /* Rotating buffer */ ++extern int soundbuffer_len; ++extern int soundbuffer_readpos; ++extern int soundbuffer_writepos; ++extern double backto_lastdraw_samplecount; /* Samples from writepos */ + /* to the sample which was sample 1 at last draw */ + /* This variable will be negative */ + + /* Samplepieces buffer */ +-u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; ++extern u_int8_t samplepieces_buffer[DRAWAREA_WIDTH*SAMPLEPIECES_MAX]; + /* Rotating buffer */ +-int samplepieces_which_is_zero; /**< Which slot is number 0 */ ++extern int samplepieces_which_is_zero; /**< Which slot is number 0 */ + /** + * \brief Number of times to draw over and over a samplepiece + */ +-int samplepieces_count; /* How many slots to use */ ++extern int samplepieces_count; /* How many slots to use */ + /** + * \brief Number of samplepieces to stack on display in finetune mode + */ +-int samplepieces_count_finetune; ++extern int samplepieces_count_finetune; + /** + * \brief Number of samplepieces to stack on display in coarsetune mode + */ +-int samplepieces_count_coarsetune; +-int samplepieces_last_valid; /**< How many valid slots -1 */ ++extern int samplepieces_count_coarsetune; ++extern int samplepieces_last_valid; /**< How many valid slots -1 */ + + /* --- */ +-double frequency; /**< Frequency */ +-gboolean frequency_set; +-double wavelength_samples; /**< Wavelength in samples */ +-int samplerate; /**< Sampling rate */ +-double downsample_ratio; /**< Downsample ratio */ ++extern double frequency; /**< Frequency */ ++extern gboolean frequency_set; ++extern double wavelength_samples; /**< Wavelength in samples */ ++extern int samplerate; /**< Sampling rate */ ++extern double downsample_ratio; /**< Downsample ratio */ + +-int tuner_mode_coarse; /**< If tuner is in coarse mode */ +-int tuner_mode_coarse_new; /**< If tuner should be put in coarse mode */ ++extern int tuner_mode_coarse; /**< If tuner is in coarse mode */ ++extern int tuner_mode_coarse_new; /**< If tuner should be put in coarse mode */ + +-gboolean notes_note_set; +-int notes_note; ++extern gboolean notes_note_set; ++extern int notes_note; + +-int timer_tag; /**< For GTK timeout */ +-int timer_count; /**< For coarse tuning. Update only every n timer tick. */ ++extern int timer_tag; /**< For GTK timeout */ ++extern int timer_count; /**< For coarse tuning. Update only every n timer tick. */ + +-int sound_fd; /**< File descritor for sound input */ ++extern int sound_fd; /**< File descritor for sound input */ + +-int spinbutton_freq_changed_by_user; /**< Set to FALSE before program changes frequency. */ ++extern int spinbutton_freq_changed_by_user; /**< Set to FALSE before program changes frequency. */ + +-gboolean displaystate_is_splash; /**< Showing splash-screen? */ ++extern gboolean displaystate_is_splash; /**< Showing splash-screen? */ + +-gboolean display_big; /**< Big or small display? */ +-gboolean display_cleared_around; ++extern gboolean display_big; /**< Big or small display? */ ++extern gboolean display_cleared_around; + + /* Standard selector */ +-int sel_standard_note; +-int sel_standard_octave; +-int sel_standard_last_octave; /* Last octave-menu created */ +-gboolean sel_standard_last_octave_valid; +-int sel_standard_last_scale_type; ++extern int sel_standard_note; ++extern int sel_standard_octave; ++extern int sel_standard_last_octave; /* Last octave-menu created */ ++extern gboolean sel_standard_last_octave_valid; ++extern int sel_standard_last_scale_type; + + /*--- */ +-GString *gstr_sounddev; +-GString *gstr_alsa_device; +-int scale_type; /*Which type of scale to use */ ++extern GString *gstr_sounddev; ++extern GString *gstr_alsa_device; ++extern int scale_type; /*Which type of scale to use */ + + + +--- a/src/sel_guitar.c ++++ b/src/sel_guitar.c +@@ -33,6 +33,16 @@ + #include "sel_guitar_img001.h" + + ++GtkWidget *sel_guitar_window; ++int sel_guitar_window_visible; ++ ++GtkWidget *sel_guitar_gtk_pixmap1; ++GdkPixmap *sel_guitar_gdk_pixmap1; ++GdkPixmap *sel_guitar_gdk_pixmap_picture; ++GtkWidget *sel_guitar_eventbox1; ++ ++int sel_guitar_last_position; ++ + + /** + * \brief Note numbers of the 6 guitar strings (E,A,D,G,H,E) +--- a/src/sel_guitar.h ++++ b/src/sel_guitar.h +@@ -30,8 +30,8 @@ + + /**** Global variables */ + +-GtkWidget *sel_guitar_window; +-int sel_guitar_window_visible; ++extern GtkWidget *sel_guitar_window; ++extern int sel_guitar_window_visible; + + + +@@ -39,14 +39,14 @@ + + /* GTK variables */ + /*GtkWidget *sel_guitar_window; */ +-GtkWidget *sel_guitar_gtk_pixmap1; +-GdkPixmap *sel_guitar_gdk_pixmap1; +-GdkPixmap *sel_guitar_gdk_pixmap_picture; +-GtkWidget *sel_guitar_eventbox1; ++extern GtkWidget *sel_guitar_gtk_pixmap1; ++extern GdkPixmap *sel_guitar_gdk_pixmap1; ++extern GdkPixmap *sel_guitar_gdk_pixmap_picture; ++extern GtkWidget *sel_guitar_eventbox1; + + /*int sel_guitar_window_visible; */ + +-int sel_guitar_last_position; /* Last string position drawn */ ++extern int sel_guitar_last_position; /* Last string position drawn */ + + + /**** Function declarations */ diff --git a/media-sound/pitchtune/pitchtune-0.0.4.ebuild b/media-sound/pitchtune/pitchtune-0.0.4.ebuild index 480bbb1f29df..8cded71773da 100644 --- a/media-sound/pitchtune/pitchtune-0.0.4.ebuild +++ b/media-sound/pitchtune/pitchtune-0.0.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils +EAPI=7 + +inherit autotools desktop DESCRIPTION="Precise Instrument Tweaking for Crispy Harmony - tuner" HOMEPAGE="https://sourceforge.net/projects/pitchtune/" @@ -15,26 +16,24 @@ KEYWORDS="~amd64" RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:2 - media-libs/alsa-lib -" -DEPEND=" - ${RDEPEND} - sys-devel/gettext -" - -DOCS=( AUTHORS README REQUIRED TODO ) + media-libs/alsa-lib" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + PATCHES=( "${FILESDIR}"/${PN}-0.0.4-lm.patch + "${FILESDIR}"/${PN}-0.0.4-fno-common.patch ) src_prepare() { default - + mv configure.{in,ac} || die eautoreconf } src_install() { default + dodoc REQUIRED doicon pixmaps/${PN}.xpm make_desktop_entry ${PN} Pitchtune -- cgit v1.2.3